diff options
| -rwxr-xr-x | admin/osx/macdeployqt.py | 1 | ||||
| -rw-r--r-- | cmake/modules/NSIS.template.in | 11 |
2 files changed, 0 insertions, 12 deletions
diff --git a/admin/osx/macdeployqt.py b/admin/osx/macdeployqt.py index 94658b00f..bc4b72559 100755 --- a/admin/osx/macdeployqt.py +++ b/admin/osx/macdeployqt.py @@ -43,7 +43,6 @@ LIBRARY_SEARCH_PATH=[ ] QT_PLUGINS = [ - 'sqldrivers/libqsqlite.dylib', 'platforms/libqcocoa.dylib', 'imageformats/libqgif.dylib', 'imageformats/libqico.dylib', diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 0f44ab2b4..3840b6f05 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -41,7 +41,6 @@ !define SOURCE_PATH "@CMAKE_SOURCE_DIR@" !define QT_DLL_PATH "${MING_BIN}" !define ACCESSIBLE_DLL_PATH "${MING_LIB}/qt5/plugins/accessible" -!define SQLITE_DLL_PATH "${MING_LIB}/qt5/plugins/sqldrivers" !define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt5/plugins/imageformats" !define PLATFORMS_DLL_PATH "${MING_LIB}/qt5/plugins/platforms" @@ -410,9 +409,6 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION File "${IMAGEFORMATS_DLL_PATH}\qsvg.dll" ; PNG is built in Qt - SetOutPath "$INSTDIR\sqldrivers" - File "${SQLITE_DLL_PATH}\qsqlite.dll" - SetOutPath "$INSTDIR" ;License & release notes. File "@CPACK_RESOURCE_FILE_LICENSE@" @@ -429,16 +425,9 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION File "${QT_DLL_PATH}\Qt5Svg.dll" File "${QT_DLL_PATH}\Qt5Qml.dll" File "${QT_DLL_PATH}\Qt5Sql.dll" - File "${QT_DLL_PATH}\Qt5WebKit.dll" - File "${QT_DLL_PATH}\Qt5WebKitWidgets.dll" File "${QT_DLL_PATH}\Qt5Widgets.dll" File "${QT_DLL_PATH}\Qt5Xml.dll" - ;QtWebKit dependencies - File "${QT_DLL_PATH}\Qt5Multimedia.dll" - File "${QT_DLL_PATH}\Qt5MultimediaWidgets.dll" - File "${QT_DLL_PATH}\Qt5Sensors.dll" - ;Qt deps File "${MING_BIN}\libpng16-16.dll" File "${MING_BIN}\icudata56.dll" |