diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a7fb0e98..fb48cffe5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Core.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Core.dll new file mode 100644 index 000000000..bc231efe6 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Core.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Gui.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Gui.dll new file mode 100644 index 000000000..d73d48e09 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Gui.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Multimedia.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Multimedia.dll new file mode 100644 index 000000000..29051f488 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Multimedia.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5MultimediaWidgets.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5MultimediaWidgets.dll new file mode 100644 index 000000000..9dd0ae92a Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5MultimediaWidgets.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Network.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Network.dll new file mode 100644 index 000000000..e388906b1 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Network.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5OpenGL.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5OpenGL.dll new file mode 100644 index 000000000..14f6c1f60 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5OpenGL.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Positioning.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Positioning.dll new file mode 100644 index 000000000..7824ad60a Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Positioning.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5PrintSupport.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5PrintSupport.dll new file mode 100644 index 000000000..932100290 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5PrintSupport.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Qml.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Qml.dll new file mode 100644 index 000000000..f0ffe39fa Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Qml.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Quick.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Quick.dll new file mode 100644 index 000000000..3a8e52513 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Quick.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Sensors.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Sensors.dll new file mode 100644 index 000000000..ec05d356e Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Sensors.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Sql.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Sql.dll new file mode 100644 index 000000000..d6e424d8e Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Sql.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5WebChannel.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5WebChannel.dll new file mode 100644 index 000000000..d10eee92c Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5WebChannel.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5WebKit.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5WebKit.dll new file mode 100644 index 000000000..d472612ec Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5WebKit.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5WebKitWidgets.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5WebKitWidgets.dll new file mode 100644 index 000000000..c9c538c27 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5WebKitWidgets.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Widgets.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Widgets.dll new file mode 100644 index 000000000..9066fb243 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Widgets.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Xml.dll b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Xml.dll new file mode 100644 index 000000000..8fb99cd8a Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/Qt5Xml.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/icudt53.dll b/resources/binaries/windows/deployment/qt5-msvc2013/icudt53.dll new file mode 100644 index 000000000..4a56c52a3 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/icudt53.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/icuin53.dll b/resources/binaries/windows/deployment/qt5-msvc2013/icuin53.dll new file mode 100644 index 000000000..0abd58383 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/icuin53.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/icuuc53.dll b/resources/binaries/windows/deployment/qt5-msvc2013/icuuc53.dll new file mode 100644 index 000000000..65f63c3e7 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/icuuc53.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qdds.dll b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qdds.dll new file mode 100644 index 000000000..34b721187 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qdds.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qgif.dll b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qgif.dll new file mode 100644 index 000000000..52ca752ad Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qgif.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qicns.dll b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qicns.dll new file mode 100644 index 000000000..58fddf7f0 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qicns.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qico.dll b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qico.dll new file mode 100644 index 000000000..685a73ece Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qico.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qjpeg.dll b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qjpeg.dll new file mode 100644 index 000000000..018123638 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qjpeg.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qmng.dll b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qmng.dll new file mode 100644 index 000000000..4ad56f657 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qmng.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qsvg.dll b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qsvg.dll new file mode 100644 index 000000000..5759fbcf9 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qsvg.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qtga.dll b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qtga.dll new file mode 100644 index 000000000..9669a25ea Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qtga.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qtiff.dll b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qtiff.dll new file mode 100644 index 000000000..7890a6050 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qtiff.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qwbmp.dll b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qwbmp.dll new file mode 100644 index 000000000..a2565920f Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/imageformats/qwbmp.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/libEGL.dll b/resources/binaries/windows/deployment/qt5-msvc2013/libEGL.dll new file mode 100644 index 000000000..0f60489eb Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/libEGL.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/libGLESv2.dll b/resources/binaries/windows/deployment/qt5-msvc2013/libGLESv2.dll new file mode 100644 index 000000000..01fdfecf9 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/libGLESv2.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/libeay32.dll b/resources/binaries/windows/deployment/qt5-msvc2013/libeay32.dll new file mode 100644 index 000000000..9a48a2c8f Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/libeay32.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/libmysql.dll b/resources/binaries/windows/deployment/qt5-msvc2013/libmysql.dll new file mode 100644 index 000000000..eb254b448 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/libmysql.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/msvcp120.dll b/resources/binaries/windows/deployment/qt5-msvc2013/msvcp120.dll new file mode 100644 index 000000000..a237d2d77 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/msvcp120.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/msvcr120.dll b/resources/binaries/windows/deployment/qt5-msvc2013/msvcr120.dll new file mode 100644 index 000000000..8c36149a6 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/msvcr120.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/platforms/qminimal.dll b/resources/binaries/windows/deployment/qt5-msvc2013/platforms/qminimal.dll new file mode 100644 index 000000000..4d13d7833 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/platforms/qminimal.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/platforms/qwindows.dll b/resources/binaries/windows/deployment/qt5-msvc2013/platforms/qwindows.dll new file mode 100644 index 000000000..4bf689cb9 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/platforms/qwindows.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/printsupport/windowsprintersupport.dll b/resources/binaries/windows/deployment/qt5-msvc2013/printsupport/windowsprintersupport.dll new file mode 100644 index 000000000..375bb8ed3 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/printsupport/windowsprintersupport.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/sqldrivers/qsqlite.dll b/resources/binaries/windows/deployment/qt5-msvc2013/sqldrivers/qsqlite.dll new file mode 100644 index 000000000..82250b702 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/sqldrivers/qsqlite.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/sqldrivers/qsqlmysql.dll b/resources/binaries/windows/deployment/qt5-msvc2013/sqldrivers/qsqlmysql.dll new file mode 100644 index 000000000..796ba73e5 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/sqldrivers/qsqlmysql.dll differ diff --git a/resources/binaries/windows/deployment/qt5-msvc2013/ssleay32.dll b/resources/binaries/windows/deployment/qt5-msvc2013/ssleay32.dll new file mode 100644 index 000000000..3ba86ec57 Binary files /dev/null and b/resources/binaries/windows/deployment/qt5-msvc2013/ssleay32.dll differ