New binary files for Qt 5 build.

This commit is contained in:
Martin Rotter 2015-05-01 08:58:50 +02:00
parent 1e02d10ee3
commit 50f41f6b2d
43 changed files with 68 additions and 3 deletions

View file

@ -570,6 +570,63 @@ if(WIN32)
resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlite4.dll
resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlmysql4.dll
)
set(APP_DLLS_QT5_MSVC2013
resources/binaries/windows/deployment/qt5-msvc2013/icudt53.dll
resources/binaries/windows/deployment/qt5-msvc2013/icuin53.dll
resources/binaries/windows/deployment/qt5-msvc2013/icuuc53.dll
resources/binaries/windows/deployment/qt5-msvc2013/libeay32.dll
resources/binaries/windows/deployment/qt5-msvc2013/libEGL.dll
resources/binaries/windows/deployment/qt5-msvc2013/libGLESv2.dll
resources/binaries/windows/deployment/qt5-msvc2013/libmysql.dll
resources/binaries/windows/deployment/qt5-msvc2013/msvcp120.dll
resources/binaries/windows/deployment/qt5-msvc2013/msvcr120.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5Core.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5Gui.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5Multimedia.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5MultimediaWidgets.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5Network.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5OpenGL.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5Positioning.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5PrintSupport.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5Qml.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5Quick.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5Sensors.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5Sql.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5WebChannel.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5WebKit.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5WebKitWidgets.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5Widgets.dll
resources/binaries/windows/deployment/qt5-msvc2013/Qt5Xml.dll
resources/binaries/windows/deployment/qt5-msvc2013/ssleay32.dll
)
set(APP_DLLS_QT5_MSVC2013_IMAGEFORMATS
resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qdds.dll
resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qgif.dll
resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qicns.dll
resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qico.dll
resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qjpeg.dll
resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qmng.dll
resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qsvg.dll
resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qtga.dll
resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qtiff.dll
resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qwbmp.dll
)
set(APP_DLLS_QT5_MSVC2013_SQLDRIVERS
resources/binaries/windows/deployment/qt5-msvc2013/sqldrivers/qsqlite.dll
resources/binaries/windows/deployment/qt5-msvc2013/sqldrivers/qsqlmysql.dll
)
set(APP_DLLS_QT5_MSVC2013_PLATFORMS
resources/binaries/windows/deployment/qt5-msvc2013/platforms/qminimal.dll
resources/binaries/windows/deployment/qt5-msvc2013/platforms/qwindows.dll
)
set(APP_DLLS_QT5_MSVC2013_PRINTSUPPORT
resources/binaries/windows/deployment/qt5-msvc2013/printsupport/windowsprintersupport.dll
)
endif(WIN32)
# Add custom icon on Mac OS X.
@ -661,12 +718,20 @@ if(WIN32 OR OS2)
message(STATUS "[${APP_LOW_NAME}] You will probably install on Windows or OS/2.")
install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ./)
# Copy DLLs and other binary files for main installation and updater.
if(WIN32 AND NOT ${USE_QT_5})
# Copy DLLs and other binary files for main installation.
#if(WIN32 AND USE_QT_5)
install(FILES ${APP_DLLS_QT5_MSVC2013} DESTINATION ./)
install(FILES ${APP_DLLS_QT5_MSVC2013_IMAGEFORMATS} DESTINATION ./imageformats)
install(FILES ${APP_DLLS_QT5_MSVC2013_SQLDRIVERS} DESTINATION ./sqldrivers)
install(FILES ${APP_DLLS_QT5_MSVC2013_PLATFORMS} DESTINATION ./platforms)
install(FILES ${APP_DLLS_QT5_MSVC2013_PRINTSUPPORT} DESTINATION ./printsupport)
#endif(WIN32 AND USE_QT_5)
if(WIN32 AND NOT USE_QT_5)
install(FILES ${APP_DLLS_QT4_MSVC2013} DESTINATION ./)
install(FILES ${APP_DLLS_QT4_MSVC2013_IMAGEFORMATS} DESTINATION ./imageformats)
install(FILES ${APP_DLLS_QT4_MSVC2013_SQLDRIVERS} DESTINATION ./sqldrivers)
endif(WIN32 AND NOT ${USE_QT_5})
endif(WIN32 AND NOT USE_QT_5)
if(BUNDLE_ICON_THEMES)
install(DIRECTORY resources/graphics/icons/mini-kfaenza DESTINATION ./icons)