This belongs with QFuture.
Change-Id: I555cd01c1d3890fbbaca4fd8a9170292ea4eb0fb
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
SOURCES += \
qfuturesynchronizer.cpp \
- qfuturewatcher.cpp \
qtconcurrentfilter.cpp \
qtconcurrentmap.cpp \
qtconcurrentthreadengine.cpp \
HEADERS += \
qtconcurrent_global.h \
qfuturesynchronizer.h \
- qfuturewatcher.h \
qtconcurrentcompilertest.h \
qtconcurrentexception.h \
qtconcurrentfilter.h \
# private headers
HEADERS += \
- qfuturewatcher_p.h
QMAKE_DOCS = $$PWD/doc/qtconcurrent.qdocconf
QMAKE_DOCS_INDEX = ../../doc
virtual void callOutInterfaceDisconnected() = 0;
};
-class Q_CORE_EXPORT QFutureInterfaceBasePrivate // ### temporary
+class QFutureInterfaceBasePrivate
{
public:
QFutureInterfaceBasePrivate(QFutureInterfaceBase::State initialState);
Example: Starting a computation and getting a slot callback when it's
finished:
- \snippet code/src_concurrent_qfuturewatcher.cpp 0
+ \snippet code/src_corelib_thread_qfuturewatcher.cpp 0
Be aware that not all asynchronous computations can be canceled or paused.
For example, the future returned by QtConcurrent::run() cannot be
QT_END_NAMESPACE
-#endif // QT_NO_CONCURRENT
+#endif // QT_NO_QFUTURE
#ifndef QFUTUREWATCHER_H
#define QFUTUREWATCHER_H
-#include <QtConcurrent/qtconcurrent_global.h>
-
#include <QtCore/qfuture.h>
#ifndef QT_NO_QFUTURE
class QEvent;
class QFutureWatcherBasePrivate;
-class Q_CONCURRENT_EXPORT QFutureWatcherBase : public QObject
+class Q_CORE_EXPORT QFutureWatcherBase : public QObject
{
Q_OBJECT
Q_DECLARE_PRIVATE(QFutureWatcherBase)
public:
explicit QFutureWatcherBase(QObject *parent = 0);
+ // de-inline dtor
int progressValue() const;
int progressMinimum() const;
QT_END_NAMESPACE
QT_END_HEADER
-#endif // QT_NO_CONCURRENT
+#endif // QT_NO_QFUTURE
#endif // QFUTUREWATCHER_H
// We mean it.
//
-#include <QtConcurrent/qtconcurrent_global.h>
-
-#include <private/qfutureinterface_p.h>
+#include "qfutureinterface_p.h"
#include <qlist.h>
#ifndef QT_NO_QFUTURE
thread/qresultstore.h \
thread/qfuture.h \
thread/qfutureinterface.h \
+ thread/qfuturewatcher.h \
thread/qbasicatomic.h \
thread/qgenericatomic.h \
thread/qoldbasicatomic.h
HEADERS += thread/qmutex_p.h \
thread/qmutexpool_p.h \
thread/qfutureinterface_p.h \
+ thread/qfuturewatcher_p.h \
thread/qorderedmutexlocker_p.h \
thread/qreadwritelock_p.h \
thread/qthread_p.h \
thread/qexception.cpp \
thread/qresultstore.cpp \
thread/qfutureinterface.cpp \
+ thread/qfuturewatcher.cpp \
thread/qmutex.cpp \
thread/qreadwritelock.cpp \
thread/qrunnable.cpp \
TEMPLATE=subdirs
SUBDIRS=\
qfuturesynchronizer \
- qfuturewatcher \
qtconcurrentfilter \
qtconcurrentiteratekernel \
qtconcurrentmap \
qatomicpointer \
qresultstore \
qfuture \
+ qfuturewatcher \
qmutex \
qmutexlocker \
qreadlocker \