From 84eb044da7473cdbd5ef774ff428ef99bc0cd8b2 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Tue, 7 Feb 2012 13:17:23 +0100
Subject: Handle the new QtConcurrent library.

---
 modules/ECMQt4To5Porting.cmake    | 4 ++++
 modules/FindQt5Transitional.cmake | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'modules')

diff --git a/modules/ECMQt4To5Porting.cmake b/modules/ECMQt4To5Porting.cmake
index 78b6e3da..8e7ea52a 100644
--- a/modules/ECMQt4To5Porting.cmake
+++ b/modules/ECMQt4To5Porting.cmake
@@ -160,6 +160,7 @@ set(_qt_modules
   Network
   Test
   Designer
+  Concurrent
   Xml
   UiTools
 )
@@ -171,6 +172,9 @@ foreach(_module ${_qt_modules})
     list(APPEND QT_INCLUDES ${Qt5${_module}_INCLUDE_DIRS})
 endforeach()
 
+list(APPEND QT_QTCORE_LIBRARIES ${Qt5Concurrent_LIBRARIES})
+list(APPEND QT_QTCORE_LIBRARY ${Qt5Concurrent_LIBRARIES})
+
 macro(qt4_wrap_ui)
   qt5_wrap_ui(${ARGN})
 endmacro()
diff --git a/modules/FindQt5Transitional.cmake b/modules/FindQt5Transitional.cmake
index 6ededaca..3a2e3535 100644
--- a/modules/FindQt5Transitional.cmake
+++ b/modules/FindQt5Transitional.cmake
@@ -31,6 +31,9 @@ if (QT5_BUILD)
       if ("${_component}" STREQUAL "DBus")
         find_package(Qt5DBusTools REQUIRED)
       endif()
+      if ("${_component}" STREQUAL "Core")
+        find_package(Qt5Concurrent REQUIRED)
+      endif()
     endforeach()
   endif()
   include("${CMAKE_CURRENT_LIST_DIR}/ECMQt4To5Porting.cmake") # TODO: Port away from this.
-- 
cgit v1.2.1