Visitar URL original
Revert libqsqlite changes for now · gitqueue/client@4c9bc42 · GitHub
Skip to content

Commit 4c9bc42

Browse files
committed
Revert libqsqlite changes for now
QtWebKit depends on it unfortunately
1 parent d09de79 commit 4c9bc42

5 files changed

Lines changed: 10 additions & 5 deletions

File tree

‎cmake/modules/NSIS.template.in‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,9 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
403403
File "${IMAGEFORMATS_DLL_PATH}\qjpeg.dll"
404404
File "${IMAGEFORMATS_DLL_PATH}\qico.dll"
405405

406+
SetOutPath "$INSTDIR\sqldrivers"
407+
File "${SQLITE_DLL_PATH}\qsqlite.dll"
408+
406409
SetOutPath "$INSTDIR"
407410
;License & release notes.
408411
File "@CPACK_RESOURCE_FILE_LICENSE@"
@@ -416,6 +419,7 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
416419
File "${QT_DLL_PATH}\Qt5PrintSupport.dll"
417420
File "${QT_DLL_PATH}\Qt5Qml.dll"
418421
File "${QT_DLL_PATH}\Qt5Quick.dll"
422+
File "${QT_DLL_PATH}\Qt5Sql.dll"
419423
File "${QT_DLL_PATH}\Qt5WebKit.dll"
420424
File "${QT_DLL_PATH}\Qt5WebKitWidgets.dll"
421425
File "${QT_DLL_PATH}\Qt5Widgets.dll"
@@ -443,6 +447,7 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
443447
File "${MING_BIN}\libxslt-1.dll"
444448
File "${MING_BIN}\libxml2-2.dll"
445449
File "${MING_BIN}\zlib1.dll"
450+
File "${MING_BIN}\libsqlite3-0.dll"
446451

447452
;QtKeyChain stuff
448453
File "${MING_BIN}\libqt5keychain.dll"

‎src/cmd/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ include_directories(${CMAKE_SOURCE_DIR}/csync/src
1919

2020
if(NOT BUILD_LIBRARIES_ONLY)
2121
add_executable(${cmd_NAME} ${cmd_SRC})
22-
qt5_use_modules(${cmd_NAME} Network)
22+
qt5_use_modules(${cmd_NAME} Network Sql)
2323
set_target_properties(${cmd_NAME} PROPERTIES
2424
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
2525
set_target_properties(${cmd_NAME} PROPERTIES

‎src/gui/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,14 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
227227

228228
# add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src})
229229
add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src})
230-
qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets ${ADDITIONAL_APP_MODULES})
230+
qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES})
231231
else()
232232
# set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf.
233233
set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns")
234234

235235
# we must add MACOSX_BUNDLE only if building a bundle
236236
add_executable( ${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${final_src})
237-
qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets ${ADDITIONAL_APP_MODULES})
237+
qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES})
238238

239239
set (QM_DIR ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/Translations)
240240
install(FILES ${client_I18N} DESTINATION ${QM_DIR})

‎src/libsync/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ endif()
168168

169169
if(BUILD_LIBRARIES_ONLY)
170170
#add_library(${synclib_NAME}_static STATIC ${libsync_SRCS} ${syncMoc})
171-
#qt5_use_modules(${synclib_NAME}_static Widgets Network Xml)
171+
#qt5_use_modules(${synclib_NAME}_static Widgets Network Xml Sql)
172172

173173
#set_target_properties( ${synclib_NAME}_static PROPERTIES
174174
# VERSION ${MIRALL_VERSION}

‎test/owncloud_add_test.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ macro(owncloud_add_test test_class additional_cpp)
1414
qt_wrap_cpp(test${OWNCLOUD_TEST_CLASS_LOWERCASE}.h)
1515

1616
add_executable(${OWNCLOUD_TEST_CLASS}Test test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${additional_cpp})
17-
qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Xml Network Gui Widgets)
17+
qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Sql Xml Network Gui Widgets)
1818

1919
target_link_libraries(${OWNCLOUD_TEST_CLASS}Test
2020
updater

0 commit comments

Comments
 (0)