Revert libqsqlite changes for now

QtWebKit depends on it unfortunately

diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index 5dd9cde956cf7aac9e9493b1510b5f5116addf62..98d5a3df69ccc2522c551b1f8bce98c33325cb79 100644 (file)
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -403,6 +403,9 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    File "${IMAGEFORMATS_DLL_PATH}\qjpeg.dll"
    File "${IMAGEFORMATS_DLL_PATH}\qico.dll"
 
+   SetOutPath "$INSTDIR\sqldrivers"
+   File "${SQLITE_DLL_PATH}\qsqlite.dll"
+
    SetOutPath "$INSTDIR"
    ;License & release notes.
    File "@CPACK_RESOURCE_FILE_LICENSE@"
@@ -416,6 +419,7 @@ 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"
@@ -443,6 +447,7 @@ 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 d4a8420634a9e3c73140de2af3e42fb5c2870848..caea5ce89cc16383c951b958a787580ba61ea1c6 100644 (file)
--- 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)
+       qt5_use_modules(${cmd_NAME} Network Sql)
        set_target_properties(${cmd_NAME} PROPERTIES
                RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
         set_target_properties(${cmd_NAME} PROPERTIES

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 51a927b4f72b02b1fa5bf1298b446d7b618ec65f..a892ab1f27c158d778e9fd6279f3ed0aa4ccfd57 100644 (file)
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -227,14 +227,14 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
 
     # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src})
     add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src})
-    qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets ${ADDITIONAL_APP_MODULES})
+    qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES})
 else()
     # set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf.
     set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns")
 
     # we must add MACOSX_BUNDLE only if building a bundle
     add_executable( ${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${final_src})
-    qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets ${ADDITIONAL_APP_MODULES})
+    qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql  ${ADDITIONAL_APP_MODULES})
 
     set (QM_DIR ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/Translations)
     install(FILES ${client_I18N} DESTINATION ${QM_DIR})

diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index a3704a3ad6ec6c66b400868fc25439394a59d836..26b012ca982127f79ddc0f9f1c5cd6e3f3bea610 100644 (file)
--- 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)
+    #qt5_use_modules(${synclib_NAME}_static Widgets Network Xml Sql)
 
     #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 154c759813ee6ca31807a3c00084eac157d70e31..d1a67f16b7ef5e1d90139a925d8f5d1ecc64d6b6 100644 (file)
--- 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 Xml Network Gui Widgets)
+    qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Sql Xml Network Gui Widgets)
 
     target_link_libraries(${OWNCLOUD_TEST_CLASS}Test
         updater