diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e6806875..b2afa4859 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -547,34 +547,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 -# resourcegit coms/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 + resourcegit coms/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 @@ -732,11 +732,11 @@ if(WIN32 OR OS2) 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) + 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 new file mode 100644 index 000000000..8bdc10147 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/QtCore4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/QtGui4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/QtGui4.dll new file mode 100644 index 000000000..1b818ec9b Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/QtGui4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/QtNetwork4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/QtNetwork4.dll new file mode 100644 index 000000000..a7e4390f3 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/QtNetwork4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/QtSql4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/QtSql4.dll new file mode 100644 index 000000000..ce9a33c2c Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/QtSql4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/QtWebKit4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/QtWebKit4.dll new file mode 100644 index 000000000..c5e24cdd9 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/QtWebKit4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/QtXml4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/QtXml4.dll new file mode 100644 index 000000000..16c356c12 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/QtXml4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qgif4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qgif4.dll new file mode 100644 index 000000000..cde6dfcc7 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qgif4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qico4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qico4.dll new file mode 100644 index 000000000..00337bed5 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qico4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qjpeg4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qjpeg4.dll new file mode 100644 index 000000000..3a1a9c508 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qjpeg4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qmng4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qmng4.dll new file mode 100644 index 000000000..a6ccb0e85 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qmng4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qsvg4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qsvg4.dll new file mode 100644 index 000000000..36575a6a6 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qsvg4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtga4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtga4.dll new file mode 100644 index 000000000..2832d5371 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtga4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtiff4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtiff4.dll new file mode 100644 index 000000000..887b34f23 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/imageformats/qtiff4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/libeay32.dll b/resources/binaries/windows/deployment/qt4-msvc2013/libeay32.dll new file mode 100644 index 000000000..9a48a2c8f Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/libeay32.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/libmysql.dll b/resources/binaries/windows/deployment/qt4-msvc2013/libmysql.dll new file mode 100644 index 000000000..eb254b448 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/libmysql.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/msvcp120.dll b/resources/binaries/windows/deployment/qt4-msvc2013/msvcp120.dll new file mode 100644 index 000000000..a237d2d77 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/msvcp120.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/msvcr120.dll b/resources/binaries/windows/deployment/qt4-msvc2013/msvcr120.dll new file mode 100644 index 000000000..8c36149a6 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/msvcr120.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlite4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlite4.dll new file mode 100644 index 000000000..59346a51f Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlite4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlmysql4.dll b/resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlmysql4.dll new file mode 100644 index 000000000..e08bb41a2 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/sqldrivers/qsqlmysql4.dll differ diff --git a/resources/binaries/windows/deployment/qt4-msvc2013/ssleay32.dll b/resources/binaries/windows/deployment/qt4-msvc2013/ssleay32.dll new file mode 100644 index 000000000..3ba86ec57 Binary files /dev/null and b/resources/binaries/windows/deployment/qt4-msvc2013/ssleay32.dll differ