From bf376e97ae61f7354caa3d803642534d91f0dfcc Mon Sep 17 00:00:00 2001 From: Gennady Pospelov <g.pospelov@fz-juelich.de> Date: Tue, 26 Aug 2014 10:49:39 +0200 Subject: [PATCH] List of Qt libs for Win installer is updated --- GUI/coregui/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/GUI/coregui/CMakeLists.txt b/GUI/coregui/CMakeLists.txt index c81b62cc6c9..b7064eb0f0a 100644 --- a/GUI/coregui/CMakeLists.txt +++ b/GUI/coregui/CMakeLists.txt @@ -190,8 +190,8 @@ if(WIN32) # ${ROOTSYS}/etc/plugins/TVirtualX # DESTINATION etc/plugins COMPONENT Libraries) # -# # --- Qt --- -# STRING(REGEX REPLACE "\\\\" "/" QTDIR $ENV{QTDIR} ) # Convert C:\root\ to C:/root/ + # --- Qt --- + STRING(REGEX REPLACE "\\\\" "/" QTDIR $ENV{QTDIR} ) # Convert C:\Qt\ to C:/Qt/ install(FILES ${QTDIR}/bin/Qt5Widgets.DLL @@ -201,11 +201,11 @@ if(WIN32) ${QTDIR}/bin/Qt5WebKitWidgets.dll ${QTDIR}/bin/Qt5Designer.dll ${QTDIR}/bin/Qt5Xml.dll - ${QTDIR}/bin/libGLESv2.dll - ${QTDIR}/bin/libEGL.dll - ${QTDIR}/bin/icuin51.dll - ${QTDIR}/bin/icuuc51.dll - ${QTDIR}/bin/icudt51.dll + #${QTDIR}/bin/libGLESv2.dll + #${QTDIR}/bin/libEGL.dll + ${QTDIR}/bin/icuin52.dll + ${QTDIR}/bin/icuuc52.dll + ${QTDIR}/bin/icudt52.dll ${QTDIR}/bin/Qt5Multimedia.dll ${QTDIR}/bin/Qt5MultimediaWidgets.dll ${QTDIR}/bin/Qt5OpenGL.dll @@ -215,7 +215,7 @@ if(WIN32) ${QTDIR}/bin/Qt5Quick.dll ${QTDIR}/bin/Qt5Sensors.dll ${QTDIR}/bin/Qt5Sql.dll - ${QTDIR}/bin/Qt5V8.dll + #${QTDIR}/bin/Qt5V8.dll ${QTDIR}/bin/Qt5WebKit.dll DESTINATION ${destination_lib} COMPONENT Libraries) -- GitLab