[Pkg-owncloud-commits] [owncloud-client] 53/175: Find & use QtConcurrent

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 9693048f787901ba3986d34109bdcc1f3c84deb6
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Thu Dec 18 15:52:06 2014 +0100

    Find & use QtConcurrent
---
 cmake/modules/QtVersionAbstraction.cmake | 3 ++-
 src/libsync/CMakeLists.txt               | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmake/modules/QtVersionAbstraction.cmake b/cmake/modules/QtVersionAbstraction.cmake
index 020aab4..84402bb 100644
--- a/cmake/modules/QtVersionAbstraction.cmake
+++ b/cmake/modules/QtVersionAbstraction.cmake
@@ -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()
diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index e926f1b..cb9490b 100644
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git