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>
This commit is contained in:
parent
86ee853f47
commit
8cb26f8511
@ -60,7 +60,7 @@ class QFutureInterfaceBasePrivate;
|
||||
class QFutureWatcherBase;
|
||||
class QFutureWatcherBasePrivate;
|
||||
|
||||
class Q_CORE_EXPORT QFutureInterfaceBase
|
||||
class Q_CONCURRENT_EXPORT QFutureInterfaceBase
|
||||
{
|
||||
public:
|
||||
enum State {
|
||||
|
@ -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)
|
||||
|
@ -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() { }
|
||||
|
@ -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);
|
||||
|
@ -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();
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user