diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-16 08:25:07 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-16 08:25:07 (GMT) |
| commit | 91bf24d44690a643d7cb74ab594da949b9e51e1b (patch) | |
| tree | 2cb20fdccd88afd647cfe9ecd8e97a98a14bb6e1 /src/corelib/concurrent/qfuturewatcher.h | |
| parent | a363fad3f45335c6f03108a0ece5472901aa970f (diff) | |
| parent | 7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (diff) | |
| download | Qt-91bf24d44690a643d7cb74ab594da949b9e51e1b.zip Qt-91bf24d44690a643d7cb74ab594da949b9e51e1b.tar.gz Qt-91bf24d44690a643d7cb74ab594da949b9e51e1b.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8'
Diffstat (limited to 'src/corelib/concurrent/qfuturewatcher.h')
| -rw-r--r-- | src/corelib/concurrent/qfuturewatcher.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/corelib/concurrent/qfuturewatcher.h b/src/corelib/concurrent/qfuturewatcher.h index 5fe2007..26e549d 100644 --- a/src/corelib/concurrent/qfuturewatcher.h +++ b/src/corelib/concurrent/qfuturewatcher.h @@ -44,8 +44,6 @@ #include <QtCore/qfuture.h> -#ifndef QT_NO_QFUTURE - #include <QtCore/qobject.h> QT_BEGIN_HEADER @@ -56,6 +54,11 @@ QT_MODULE(Core) class QEvent; class QFutureWatcherBasePrivate; + +#ifdef QT_NO_QFUTURE +class QFutureInterfaceBase; +#endif + class Q_CORE_EXPORT QFutureWatcherBase : public QObject { Q_OBJECT @@ -114,6 +117,8 @@ private: virtual QFutureInterfaceBase &futureInterface() = 0; }; +#ifndef QT_NO_QFUTURE + template <typename T> class QFutureWatcher : public QFutureWatcherBase { @@ -214,9 +219,9 @@ Q_INLINE_TEMPLATE void QFutureWatcher<void>::setFuture(const QFuture<void> &_fut connectOutputInterface(); } +#endif // QT_NO_QFUTURE + QT_END_NAMESPACE QT_END_HEADER -#endif // QT_NO_CONCURRENT - #endif // QFUTUREWATCHER_H |