diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/concurrent/concurrent.pro | 2 | ||||
-rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_thread_qfuturesynchronizer.cpp (renamed from src/concurrent/doc/snippets/code/src_concurrent_qfuturesynchronizer.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/thread/qfuturesynchronizer.h (renamed from src/concurrent/qfuturesynchronizer.h) | 6 | ||||
-rw-r--r-- | src/corelib/thread/qfuturesynchronizer.qdoc (renamed from src/concurrent/qfuturesynchronizer.cpp) | 2 | ||||
-rw-r--r-- | src/corelib/thread/thread.pri | 1 |
5 files changed, 4 insertions, 7 deletions
diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index 20a9356e53..f30f75e46e 100644 --- a/src/concurrent/concurrent.pro +++ b/src/concurrent/concurrent.pro @@ -12,7 +12,6 @@ load(qt_module) PRECOMPILED_HEADER = ../corelib/global/qt_pch.h SOURCES += \ - qfuturesynchronizer.cpp \ qtconcurrentfilter.cpp \ qtconcurrentmap.cpp \ qtconcurrentthreadengine.cpp \ @@ -20,7 +19,6 @@ SOURCES += \ HEADERS += \ qtconcurrent_global.h \ - qfuturesynchronizer.h \ qtconcurrentcompilertest.h \ qtconcurrentexception.h \ qtconcurrentfilter.h \ diff --git a/src/concurrent/doc/snippets/code/src_concurrent_qfuturesynchronizer.cpp b/src/corelib/doc/snippets/code/src_corelib_thread_qfuturesynchronizer.cpp index 7b2d3d2b81..7b2d3d2b81 100644 --- a/src/concurrent/doc/snippets/code/src_concurrent_qfuturesynchronizer.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_thread_qfuturesynchronizer.cpp diff --git a/src/concurrent/qfuturesynchronizer.h b/src/corelib/thread/qfuturesynchronizer.h index b82e968d8f..12edcfb971 100644 --- a/src/concurrent/qfuturesynchronizer.h +++ b/src/corelib/thread/qfuturesynchronizer.h @@ -42,11 +42,9 @@ #ifndef QFUTURESYNCHRONIZER_H #define QFUTURESYNCHRONIZER_H -#include <QtConcurrent/qtconcurrent_global.h> - #include <QtCore/qfuture.h> -#ifndef QT_NO_CONCURRENT +#ifndef QT_NO_QFUTURE QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -117,6 +115,6 @@ protected: QT_END_NAMESPACE QT_END_HEADER -#endif // QT_NO_CONCURRENT +#endif // QT_NO_QFUTURE #endif // QFUTURESYNCHRONIZER_H diff --git a/src/concurrent/qfuturesynchronizer.cpp b/src/corelib/thread/qfuturesynchronizer.qdoc index 69ea325f07..903dc89d1e 100644 --- a/src/concurrent/qfuturesynchronizer.cpp +++ b/src/corelib/thread/qfuturesynchronizer.qdoc @@ -57,7 +57,7 @@ an easy way to ensure that all futures have finished before returning from a function: - \snippet code/src_concurrent_qfuturesynchronizer.cpp 0 + \snippet code/src_corelib_thread_qfuturesynchronizer.cpp 0 The behavior of waitForFinished() can be changed using the setCancelOnWait() function. Calling setCancelOnWait(true) will cause diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri index 6e341beb75..7247f2984e 100644 --- a/src/corelib/thread/thread.pri +++ b/src/corelib/thread/thread.pri @@ -14,6 +14,7 @@ HEADERS += thread/qmutex.h \ thread/qresultstore.h \ thread/qfuture.h \ thread/qfutureinterface.h \ + thread/qfuturesynchronizer.h \ thread/qfuturewatcher.h \ thread/qbasicatomic.h \ thread/qgenericatomic.h \ |