From: Markus Goetz <markus@woboq.com>
Date: Mon, 19 Oct 2015 11:46:13 +0000 (+0200)
Subject: CMake/NSIS: We don't need QtSql
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1395^2~21
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=af79bc921102b071161135973f0d420fce6ed769;p=nextcloud-desktop.git

CMake/NSIS: We don't need QtSql

The NSIS change also had a redundant libsqlite3 DLL entry
---

diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index 98d5a3df6..efe48f9ee 100644
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -419,7 +419,6 @@ 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}\Qt5Sql.dll"
    File "${QT_DLL_PATH}\Qt5WebKit.dll"
    File "${QT_DLL_PATH}\Qt5WebKitWidgets.dll"
    File "${QT_DLL_PATH}\Qt5Widgets.dll"
@@ -447,7 +446,6 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    File "${MING_BIN}\libxslt-1.dll"
    File "${MING_BIN}\libxml2-2.dll"
    File "${MING_BIN}\zlib1.dll"
-   File "${MING_BIN}\libsqlite3-0.dll"
 
    ;QtKeyChain stuff
    File "${MING_BIN}\libqt5keychain.dll"
diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
index caea5ce89..d4a842063 100644
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(${CMAKE_SOURCE_DIR}/csync/src
 
 if(NOT BUILD_LIBRARIES_ONLY)
    add_executable(${cmd_NAME}  ${cmd_SRC})
-	qt5_use_modules(${cmd_NAME} Network Sql)
+	qt5_use_modules(${cmd_NAME} Network)
 	set_target_properties(${cmd_NAME} PROPERTIES
 	        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
         set_target_properties(${cmd_NAME} PROPERTIES
diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index 26b012ca9..a3704a3ad 100644
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -168,7 +168,7 @@ endif()
 
 if(BUILD_LIBRARIES_ONLY)
     #add_library(${synclib_NAME}_static STATIC ${libsync_SRCS} ${syncMoc})
-    #qt5_use_modules(${synclib_NAME}_static Widgets Network Xml Sql)
+    #qt5_use_modules(${synclib_NAME}_static Widgets Network Xml)
 
     #set_target_properties( ${synclib_NAME}_static  PROPERTIES
     #    VERSION ${MIRALL_VERSION}
diff --git a/test/owncloud_add_test.cmake b/test/owncloud_add_test.cmake
index d1a67f16b..154c75981 100644
--- a/test/owncloud_add_test.cmake
+++ b/test/owncloud_add_test.cmake
@@ -14,7 +14,7 @@ macro(owncloud_add_test test_class additional_cpp)
     qt_wrap_cpp(test${OWNCLOUD_TEST_CLASS_LOWERCASE}.h)
 
     add_executable(${OWNCLOUD_TEST_CLASS}Test test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${additional_cpp})
-    qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Sql Xml Network Gui Widgets)
+    qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Xml Network Gui Widgets)
 
     target_link_libraries(${OWNCLOUD_TEST_CLASS}Test
         updater