From 8cb26f85119e6f11da613c95790c1b2c19f01dbd Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 6 Feb 2012 13:45:03 +0100
Subject: [PATCH] Complete split of QtConcurrent.

- Fix exports.
- Fix tests.

Acked-by:  Thiago Macieira <thiago.macieira@intel.com>

Change-Id: I2df923ba74b468f5ee09b3a48ae3d09920751365
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 src/concurrent/qfutureinterface.h                       | 2 +-
 src/concurrent/qfuturewatcher.h                         | 2 +-
 src/concurrent/qtconcurrentexception.h                  | 8 ++++----
 src/concurrent/qtconcurrentiteratekernel.h              | 2 +-
 src/concurrent/qtconcurrentresultstore.h                | 4 ++--
 src/concurrent/qtconcurrentthreadengine.h               | 2 +-
 tests/auto/concurrent/qfuture/qfuture.pro               | 2 +-
 tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/concurrent/qfutureinterface.h b/src/concurrent/qfutureinterface.h
index f64623ae58..3f05466cc6 100644
--- a/src/concurrent/qfutureinterface.h
+++ b/src/concurrent/qfutureinterface.h
@@ -60,7 +60,7 @@ class QFutureInterfaceBasePrivate;
 class QFutureWatcherBase;
 class QFutureWatcherBasePrivate;
 
-class Q_CORE_EXPORT QFutureInterfaceBase
+class Q_CONCURRENT_EXPORT QFutureInterfaceBase
 {
 public:
     enum State {
diff --git a/src/concurrent/qfuturewatcher.h b/src/concurrent/qfuturewatcher.h
index 0e94863d12..6b4b941621 100644
--- a/src/concurrent/qfuturewatcher.h
+++ b/src/concurrent/qfuturewatcher.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 class QEvent;
 
 class QFutureWatcherBasePrivate;
-class Q_CORE_EXPORT QFutureWatcherBase : public QObject
+class Q_CONCURRENT_EXPORT QFutureWatcherBase : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QFutureWatcherBase)
diff --git a/src/concurrent/qtconcurrentexception.h b/src/concurrent/qtconcurrentexception.h
index b04e1f2a04..2021e7787c 100644
--- a/src/concurrent/qtconcurrentexception.h
+++ b/src/concurrent/qtconcurrentexception.h
@@ -62,14 +62,14 @@ namespace QtConcurrent
 
 #ifndef QT_NO_EXCEPTIONS
 
-class Q_CORE_EXPORT Exception : public std::exception
+class Q_CONCURRENT_EXPORT Exception : public std::exception
 {
 public:
     virtual void raise() const;
     virtual Exception *clone() const;
 };
 
-class Q_CORE_EXPORT UnhandledException : public Exception
+class Q_CONCURRENT_EXPORT UnhandledException : public Exception
 {
 public:
     void raise() const;
@@ -90,7 +90,7 @@ public:
     QExplicitlySharedDataPointer<Base> base;
 };
 
-class Q_CORE_EXPORT ExceptionStore
+class Q_CONCURRENT_EXPORT ExceptionStore
 {
 public:
     void setException(const Exception &e);
@@ -107,7 +107,7 @@ public:
 
 namespace internal {
 
-class Q_CORE_EXPORT ExceptionStore
+class Q_CONCURRENT_EXPORT ExceptionStore
 {
 public:
     ExceptionStore() { }
diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h
index a28bc31a64..4858053752 100644
--- a/src/concurrent/qtconcurrentiteratekernel.h
+++ b/src/concurrent/qtconcurrentiteratekernel.h
@@ -80,7 +80,7 @@ namespace QtConcurrent {
     management is done on the basis of the median of several timing measuremens,
     and it is done induvidualy for each thread.
 */
-class Q_CORE_EXPORT BlockSizeManager
+class Q_CONCURRENT_EXPORT BlockSizeManager
 {
 public:
     BlockSizeManager(int iterationCount);
diff --git a/src/concurrent/qtconcurrentresultstore.h b/src/concurrent/qtconcurrentresultstore.h
index d39a45bba3..4be3c20d48 100644
--- a/src/concurrent/qtconcurrentresultstore.h
+++ b/src/concurrent/qtconcurrentresultstore.h
@@ -78,7 +78,7 @@ public:
     const void *result; // if count is 0 it's a result, otherwise it's a vector.
 };
 
-class Q_CORE_EXPORT ResultIteratorBase
+class Q_CONCURRENT_EXPORT ResultIteratorBase
 {
 public:
     ResultIteratorBase();
@@ -119,7 +119,7 @@ public:
     }
 };
 
-class Q_CORE_EXPORT ResultStoreBase
+class Q_CONCURRENT_EXPORT ResultStoreBase
 {
 public:
     ResultStoreBase();
diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h
index 20e86f59b6..679496ce40 100644
--- a/src/concurrent/qtconcurrentthreadengine.h
+++ b/src/concurrent/qtconcurrentthreadengine.h
@@ -93,7 +93,7 @@ enum ThreadFunctionResult { ThrottleThread, ThreadFinished };
 // Can be run in three modes: single threaded, multi-threaded blocking
 // and multi-threaded asynchronous.
 // The code for the single threaded mode is
-class Q_CORE_EXPORT ThreadEngineBase: public QRunnable
+class Q_CONCURRENT_EXPORT ThreadEngineBase: public QRunnable
 {
 public:
     // Public API:
diff --git a/tests/auto/concurrent/qfuture/qfuture.pro b/tests/auto/concurrent/qfuture/qfuture.pro
index a4c706129d..c0fe7ec5a3 100644
--- a/tests/auto/concurrent/qfuture/qfuture.pro
+++ b/tests/auto/concurrent/qfuture/qfuture.pro
@@ -1,5 +1,5 @@
 CONFIG += testcase parallel_test
 TARGET = tst_qfuture
-QT = concurrent-private testlib concurrent
+QT = core concurrent-private testlib concurrent
 SOURCES = tst_qfuture.cpp
 DEFINES += QT_STRICT_ITERATORS
diff --git a/tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro b/tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro
index 3b8ebda4a4..e9caf5494a 100644
--- a/tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro
+++ b/tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro
@@ -1,4 +1,4 @@
 CONFIG += testcase parallel_test
 TARGET = tst_qfuturewatcher
-QT = concurrent-private testlib concurrent
+QT = core concurrent-private testlib concurrent
 SOURCES = tst_qfuturewatcher.cpp