mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-29 12:19:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

Find & use QtConcurrent

Browse source
This commit is contained in:
Daniel Molkentin 2014-12-18 15:52:06 +01:00 committed by Klaas Freitag
parent 101d2268ff
commit 9693048f78
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmake/modules/QtVersionAbstraction.cmake
View file

@ -17,6 +17,7 @@ if( Qt5Core_FOUND )
message(STATUS "Found Qt5 core, checking for further dependencies...") message(STATUS "Found Qt5 core, checking for further dependencies...")
find_package(Qt5Network REQUIRED) find_package(Qt5Network REQUIRED)
find_package(Qt5Xml REQUIRED) find_package(Qt5Xml REQUIRED)
find_package(Qt5Concurrent REQUIRED)
if(NOT TOKEN_AUTH_ONLY) if(NOT TOKEN_AUTH_ONLY)
find_package(Qt5WebKitWidgets REQUIRED) find_package(Qt5WebKitWidgets REQUIRED)
find_package(Qt5WebKit REQUIRED) find_package(Qt5WebKit REQUIRED)
@ -111,7 +112,7 @@ endif( Qt5Core_FOUND )
if(NOT Qt5Core_FOUND) if(NOT Qt5Core_FOUND)
message(STATUS "Could not find Qt5, searching for Qt4 instead...") message(STATUS "Could not find Qt5, searching for Qt4 instead...")
set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork" "QtGui" "QtWebkit") set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork" "QtGui" "QtWebkit" "QtConcurrent")
if( BUILD_TESTS ) if( BUILD_TESTS )
list(APPEND NEEDED_QT4_COMPONENTS "QtTest") list(APPEND NEEDED_QT4_COMPONENTS "QtTest")
endif() endif()

4
src/libsync/CMakeLists.txt
View file

@ -151,9 +151,9 @@ GENERATE_EXPORT_HEADER( ${synclib_NAME}
if(TOKEN_AUTH_ONLY) if(TOKEN_AUTH_ONLY)
qt5_use_modules(${synclib_NAME} Network) qt5_use_modules(${synclib_NAME} Network Concurrent)
else() else()
qt5_use_modules(${synclib_NAME} Widgets Network WebKitWidgets) qt5_use_modules(${synclib_NAME} Widgets Network WebKitWidgets Concurrent)
endif() endif()
set_target_properties( ${synclib_NAME} PROPERTIES set_target_properties( ${synclib_NAME} PROPERTIES