Add new Qt 5.4 dependencies, remove neon ones

owncloud · Jan 28, 2015 · 2a3df55 · guruz · Jan 28, 2015 · danimo
1 parent b0dbb49
commit 2a3df55
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
@@ -422,13 +422,17 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    File "${QT_DLL_PATH}\Qt5PrintSupport.dll"
    File "${QT_DLL_PATH}\Qt5Qml.dll"
    File "${QT_DLL_PATH}\Qt5Quick.dll"
-   File "${QT_DLL_PATH}\Qt5Sensors.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}\icudata53.dll"
@@ -445,21 +449,13 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    File "${MING_BIN}\libstdc++-6.dll"
    File "${MING_BIN}\libwebp-4.dll"
    File "${MING_BIN}\libxslt-1.dll"
+   File "${MING_BIN}\libxml2-2.dll"
    File "${MING_BIN}\zlib1.dll"
-
-   ;QtSql and csync dep
    File "${MING_BIN}\libsqlite3-0.dll"
 
    ;QtKeyChain stuff
    File "${MING_BIN}\libqt5keychain.dll"
 
-   ;ownCloud plugin
-   File "${MING_BIN}\libintl-8.dll"
-   File "${MING_BIN}\libneon-27.dll"
-   File "${MING_BIN}\libproxy.dll"
-   File "${MING_BIN}\libmodman.dll"
-   File "${MING_BIN}\libxml2-2.dll"
-
    ;MinGW stuff
    File "${MING_BIN}\libgcc_s_sjlj-1.dll"
    File "${MING_BIN}\libstdc++-6.dll"