Revert "Remove references to qsqlite3"

QtWebkit needs it

This reverts commit b1c10c8454.

admin/osx/macdeployqt.py

@@ -34,6 +34,7 @@ LIBRARY_SEARCH_PATH=['/usr/local/lib', '.']
 
 QT_PLUGINS = [
     'accessible/libqtaccessiblewidgets.dylib',
+    'sqldrivers/libqsqlite.dylib',
     'platforms/libqcocoa.dylib',
     'imageformats/libqgif.dylib',
     'imageformats/libqico.dylib',

cmake/modules/NSIS.template.in

@@ -37,6 +37,7 @@
 !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"
 
@@ -402,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 +420,7 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    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"
@@ -431,6 +436,7 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    File "${MING_BIN}\libjpeg-8.dll"
    File "${MING_BIN}\libpcre16-0.dll"
    File "${MING_BIN}\libproxy.dll"
+   File "${MING_BIN}\libsqlite3-0.dll"
    File "${MING_BIN}\libcrypto-10.dll"
    File "${MING_BIN}\libssl-10.dll"
    File "${MING_BIN}\libstdc++-6.dll"
@@ -438,6 +444,9 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    File "${MING_BIN}\libxslt-1.dll"
    File "${MING_BIN}\zlib1.dll"
 
+   ;QtSql and csync dep
+   File "${MING_BIN}\libsqlite3-0.dll"
+
    ;QtKeyChain stuff
    File "${MING_BIN}\libqt5keychain.dll"
 

doc/building.rst

@@ -73,12 +73,13 @@ To cross-compile:
 
   ``zypper install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
                  mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \
-                 mingw32-headers mingw32-runtime site-config \
+                 mingw32-headers mingw32-runtime site-config mingw32-libqt4-sql \
+                 mingw32-libqt4-sql-sqlite mingw32-sqlite mingw32-libsqlite-devel \
                  mingw32-dlfcn-devel mingw32-libssh2-devel kdewin-png2ico \
                  mingw32-libqt4 mingw32-libqt4-devel mingw32-libgcrypt \
                  mingw32-libgnutls mingw32-libneon-openssl mingw32-libneon-devel \
                  mingw32-libbeecrypt mingw32-libopenssl mingw32-openssl \
-                 mingw32-libpng-devel mingw32-qtkeychain \
+                 mingw32-libpng-devel mingw32-libsqlite mingw32-qtkeychain \
                  mingw32-qtkeychain-devel mingw32-dlfcn mingw32-libintl-devel \
                  mingw32-libneon-devel mingw32-libopenssl-devel mingw32-libproxy-devel \
                  mingw32-libxml2-devel mingw32-zlib-devel``

src/CMakeLists.txt

@@ -174,9 +174,9 @@ GENERATE_EXPORT_HEADER( ${synclib_NAME}
 
 
 if(TOKEN_AUTH_ONLY)
-    qt5_use_modules(${synclib_NAME} Network Xml)
+    qt5_use_modules(${synclib_NAME} Network Xml Sql)
 else()
-    qt5_use_modules(${synclib_NAME} Widgets Network Xml WebKitWidgets)
+    qt5_use_modules(${synclib_NAME} Widgets Network Xml WebKitWidgets Sql)
 endif()
 
 set_target_properties( ${synclib_NAME}  PROPERTIES
@@ -356,7 +356,7 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
 
     # 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})
 elseif(NOT BUILD_LIBRARIES_ONLY)
     set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
     # set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf.
@@ -364,7 +364,7 @@ elseif(NOT BUILD_LIBRARIES_ONLY)
 
     # 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 ${mirall_I18N} DESTINATION ${QM_DIR})
@@ -421,7 +421,7 @@ set(OWNCLOUDCMD_SRC owncloudcmd/simplesslerrorhandler.cpp owncloudcmd/owncloudcm
 if(NOT BUILD_LIBRARIES_ONLY)
 
    add_executable(${owncloudcmd_NAME}  ${OWNCLOUDCMD_SRC})
-        qt5_use_modules(${owncloudcmd_NAME} Network)
+	qt5_use_modules(${owncloudcmd_NAME} Network Sql)
 	set_target_properties(${owncloudcmd_NAME} PROPERTIES
 	        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
         set_target_properties(${owncloudcmd_NAME} PROPERTIES