summaryrefslogtreecommitdiffstats
path: root/src/corelib/concurrent/qfuturewatcher.cpp
diff options
context:
space:
mode:
authorSami Lempinen <sami.lempinen@nokia.com>2011-09-20 09:59:45 (GMT)
committerSami Lempinen <sami.lempinen@nokia.com>2011-09-20 09:59:45 (GMT)
commit03645fccea8f2bf997ed4191d7a67a0e93a977d6 (patch)
treeb9f1490bacd05aea265783bfb5d9e40fe6b2b0dc /src/corelib/concurrent/qfuturewatcher.cpp
parenta0ad54acd33873316908080f432768fdf3e3bfc2 (diff)
parent367a89cf5cb1282d2e966c83869a56fd22745779 (diff)
downloadQt-03645fccea8f2bf997ed4191d7a67a0e93a977d6.zip
Qt-03645fccea8f2bf997ed4191d7a67a0e93a977d6.tar.gz
Qt-03645fccea8f2bf997ed4191d7a67a0e93a977d6.tar.bz2
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'src/corelib/concurrent/qfuturewatcher.cpp')
-rw-r--r--src/corelib/concurrent/qfuturewatcher.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/concurrent/qfuturewatcher.cpp b/src/corelib/concurrent/qfuturewatcher.cpp
index 0bef4a6..a70f56b 100644
--- a/src/corelib/concurrent/qfuturewatcher.cpp
+++ b/src/corelib/concurrent/qfuturewatcher.cpp
@@ -600,5 +600,8 @@ void QFutureWatcherBase::setPaused(bool) { }
void QFutureWatcherBase::pause() { }
void QFutureWatcherBase::resume() { }
void QFutureWatcherBase::togglePaused() { }
+bool QFutureWatcherBase::event(QEvent *) { return false; }
+void QFutureWatcherBase::connectNotify(const char *) { }
+void QFutureWatcherBase::disconnectNotify(const char *) { }
#endif // QT_NO_QFUTURE