diff --git a/CMakeLists.txt b/CMakeLists.txt index fb48cffe5..2175903e5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -542,34 +542,34 @@ set(APP_TEXT ) if(WIN32) - set(APP_DLLS_QT4_MSVC2013 - resources/binaries/windows/deployment/qt4-msvc2013/libeay32.dll - resources/binaries/windows/deployment/qt4-msvc2013/msvcp120.dll - resources/binaries/windows/deployment/qt4-msvc2013/msvcr120.dll - resources/binaries/windows/deployment/qt4-msvc2013/QtCore4.dll - resources/binaries/windows/deployment/qt4-msvc2013/QtGui4.dll - resources/binaries/windows/deployment/qt4-msvc2013/QtNetwork4.dll - resources/binaries/windows/deployment/qt4-msvc2013/QtSql4.dll - resources/binaries/windows/deployment/qt4-msvc2013/QtWebKit4.dll - resources/binaries/windows/deployment/qt4-msvc2013/QtXml4.dll - resources/binaries/windows/deployment/qt4-msvc2013/ssleay32.dll - resources/binaries/windows/deployment/qt4-msvc2013/libmysql.dll - ) +# set(APP_DLLS_QT4_MSVC2013 +# resources/binaries/windows/deployment/qt4-msvc2013/libeay32.dll +# resources/binaries/windows/deployment/qt4-msvc2013/msvcp120.dll +# resources/binaries/windows/deployment/qt4-msvc2013/msvcr120.dll +# resources/binaries/windows/deployment/qt4-msvc2013/QtCore4.dll +# resources/binaries/windows/deployment/qt4-msvc2013/QtGui4.dll +# resources/binaries/windows/deployment/qt4-msvc2013/QtNetwork4.dll +# resources/binaries/windows/deployment/qt4-msvc2013/QtSql4.dll +# resources/binaries/windows/deployment/qt4-msvc2013/QtWebKit4.dll +# resources/binaries/windows/deployment/qt4-msvc2013/QtXml4.dll +# resources/binaries/windows/deployment/qt4-msvc2013/ssleay32.dll +# resources/binaries/windows/deployment/qt4-msvc2013/libmysql.dll +# ) - set(APP_DLLS_QT4_MSVC2013_IMAGEFORMATS - resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qgif4.dll - resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qico4.dll - resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qjpeg4.dll - resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qmng4.dll - resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qsvg4.dll - resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtga4.dll - resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtiff4.dll - ) +# set(APP_DLLS_QT4_MSVC2013_IMAGEFORMATS +# resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qgif4.dll +# resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qico4.dll +# resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qjpeg4.dll +# resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qmng4.dll +# resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qsvg4.dll +# resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtga4.dll +# resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtiff4.dll +# ) - set(APP_DLLS_QT4_MSVC2013_SQLDRIVERS - resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlite4.dll - resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlmysql4.dll - ) +# set(APP_DLLS_QT4_MSVC2013_SQLDRIVERS +# 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 @@ -719,19 +719,19 @@ if(WIN32 OR OS2) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ./) # Copy DLLs and other binary files for main installation. - #if(WIN32 AND USE_QT_5) + 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) + 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) +# 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) if(BUNDLE_ICON_THEMES) install(DIRECTORY resources/graphics/icons/mini-kfaenza DESTINATION ./icons) diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/QtCore4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/QtCore4.dll deleted file mode 100644 index 8bdc10147..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/QtCore4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/QtGui4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/QtGui4.dll deleted file mode 100644 index 1b818ec9b..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/QtGui4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/QtNetwork4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/QtNetwork4.dll deleted file mode 100644 index a7e4390f3..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/QtNetwork4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/QtSql4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/QtSql4.dll deleted file mode 100644 index ce9a33c2c..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/QtSql4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/QtWebKit4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/QtWebKit4.dll deleted file mode 100644 index c5e24cdd9..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/QtWebKit4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/QtXml4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/QtXml4.dll deleted file mode 100644 index 16c356c12..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/QtXml4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qgif4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qgif4.dll deleted file mode 100644 index cde6dfcc7..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qgif4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qico4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qico4.dll deleted file mode 100644 index 00337bed5..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qico4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qjpeg4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qjpeg4.dll deleted file mode 100644 index 3a1a9c508..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qjpeg4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qmng4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qmng4.dll deleted file mode 100644 index a6ccb0e85..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qmng4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qsvg4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qsvg4.dll deleted file mode 100644 index 36575a6a6..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qsvg4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtga4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtga4.dll deleted file mode 100644 index 2832d5371..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtga4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtiff4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtiff4.dll deleted file mode 100644 index 887b34f23..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtiff4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/libeay32.dll b/resources/binaries/windows/deployment/qt4-msvc2013/libeay32.dll deleted file mode 100644 index 9a48a2c8f..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/libeay32.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/libmysql.dll b/resources/binaries/windows/deployment/qt4-msvc2013/libmysql.dll deleted file mode 100644 index eb254b448..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/libmysql.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/msvcp120.dll b/resources/binaries/windows/deployment/qt4-msvc2013/msvcp120.dll deleted file mode 100644 index a237d2d77..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/msvcp120.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/msvcr120.dll b/resources/binaries/windows/deployment/qt4-msvc2013/msvcr120.dll deleted file mode 100644 index 8c36149a6..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/msvcr120.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlite4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlite4.dll deleted file mode 100644 index 59346a51f..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlite4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlmysql4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlmysql4.dll deleted file mode 100644 index e08bb41a2..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlmysql4.dll and /dev/null differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/ssleay32.dll b/resources/binaries/windows/deployment/qt4-msvc2013/ssleay32.dll deleted file mode 100644 index 3ba86ec57..000000000 Binary files a/resources/binaries/windows/deployment/qt4-msvc2013/ssleay32.dll and /dev/null differ