diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2011-09-19 08:52:32 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-09-19 08:54:22 (GMT) |
| commit | f92fc0cdbf8ec0f760c45925e3300c6c9091f1ad (patch) | |
| tree | b6a4a5e692a6bfe86b9c99fa3a5b58651dd2f8ac | |
| parent | 9b2ef45e8109dcdfce16c6c41ae38476f8aac8df (diff) | |
| download | Qt-f92fc0cdbf8ec0f760c45925e3300c6c9091f1ad.zip Qt-f92fc0cdbf8ec0f760c45925e3300c6c9091f1ad.tar.gz Qt-f92fc0cdbf8ec0f760c45925e3300c6c9091f1ad.tar.bz2 | |
Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
This solves a build issue on Solaris as the symbols were missing so
they are now added in the expected way after discussion with the
Nokia developer who approved the patch originally for winscw.
Task-number: QTBUG-21523
Merge-request: 1389
Reviewed-by: ossi
| -rw-r--r-- | src/corelib/concurrent/qfuturewatcher.cpp | 3 |
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 |