Find & use QtConcurrent
authorDaniel Molkentin <danimo@owncloud.com>
Thu, 18 Dec 2014 14:52:06 +0000 (15:52 +0100)
committerKlaas Freitag <freitag@owncloud.com>
Tue, 19 May 2015 15:09:39 +0000 (17:09 +0200)
cmake/modules/QtVersionAbstraction.cmake
src/libsync/CMakeLists.txt

index 020aab4ea332e6b5a51403814deb0008c14623ad..84402bb03105e72f34bbeff9a7c0359db2866fb4 100644 (file)
@@ -17,6 +17,7 @@ if( Qt5Core_FOUND )
     message(STATUS "Found Qt5 core, checking for further dependencies...")
     find_package(Qt5Network REQUIRED)
     find_package(Qt5Xml REQUIRED)
+    find_package(Qt5Concurrent REQUIRED)
     if(NOT TOKEN_AUTH_ONLY)
         find_package(Qt5WebKitWidgets REQUIRED)
         find_package(Qt5WebKit REQUIRED)
@@ -111,7 +112,7 @@ endif( Qt5Core_FOUND )
 if(NOT Qt5Core_FOUND)
     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 )
         list(APPEND NEEDED_QT4_COMPONENTS "QtTest")
     endif()
index e926f1b7847cf6cc9684a502125eae9b49912da8..cb9490b719a0cbfc6af439cfa755632b5e34d63f 100644 (file)
@@ -151,9 +151,9 @@ GENERATE_EXPORT_HEADER( ${synclib_NAME}
 
 
 if(TOKEN_AUTH_ONLY)
-    qt5_use_modules(${synclib_NAME} Network)
+    qt5_use_modules(${synclib_NAME} Network Concurrent)
 else()
-    qt5_use_modules(${synclib_NAME} Widgets Network WebKitWidgets)
+    qt5_use_modules(${synclib_NAME} Widgets Network WebKitWidgets Concurrent)
 endif()
 
 set_target_properties( ${synclib_NAME}  PROPERTIES