Removed Qt 4 binaries for Windows.
This commit is contained in:
parent
50f41f6b2d
commit
406c1257fa
@ -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)
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user