fix and merge QT_NO_QFUTURE with QT_NO_CONCURRENT

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/concurrent/qfuture.h b/src/core/concurrent/qfuture.h
index 89a2169..9c6c65d 100644 (file)
--- a/src/core/concurrent/qfuture.h
+++ b/src/core/concurrent/qfuture.h
@@ -24,7 +24,7 @@
 
 #include <QtCore/qglobal.h>
 
-#ifndef QT_NO_QFUTURE
+#ifndef QT_NO_CONCURRENT
 
 #include <QtCore/qfutureinterface.h>
 #include <QtCore/qstring.h>

diff --git a/src/core/concurrent/qfutureinterface.cpp b/src/core/concurrent/qfutureinterface.cpp
index 671095b..51f0829 100644 (file)
--- a/src/core/concurrent/qfutureinterface.cpp
+++ b/src/core/concurrent/qfutureinterface.cpp
@@ -22,7 +22,7 @@
 // qfutureinterface.h included from qfuture.h
 #include "qfuture.h"
 
-#ifndef QT_NO_QFUTURE
+#ifndef QT_NO_CONCURRENT
 
 #include <QtCore/qatomic.h>
 #include <QtCore/qthread.h>

diff --git a/src/core/concurrent/qfutureinterface.h b/src/core/concurrent/qfutureinterface.h
index a663b2a..29790e0 100644 (file)
--- a/src/core/concurrent/qfutureinterface.h
+++ b/src/core/concurrent/qfutureinterface.h
@@ -24,7 +24,7 @@
 
 #include <QtCore/qrunnable.h>
 
-#ifndef QT_NO_QFUTURE
+#ifndef QT_NO_CONCURRENT
 
 #include <QtCore/qmutex.h>
 #include <QtCore/qtconcurrentexception.h>

diff --git a/src/core/concurrent/qfuturewatcher.cpp b/src/core/concurrent/qfuturewatcher.cpp
index f91913f..3fe5bab 100644 (file)
--- a/src/core/concurrent/qfuturewatcher.cpp
+++ b/src/core/concurrent/qfuturewatcher.cpp
@@ -21,16 +21,14 @@
 
 #include "qfuturewatcher.h"
 
-#ifndef QT_NO_QFUTURE
-#  include <QtCore/qcoreevent.h>
-#  include <QtCore/qcoreapplication.h>
-#  include <QtCore/qthread.h>
-#  include "qfuturewatcher_p.h"
-#endif
+#ifndef QT_NO_CONCURRENT
 
-QT_BEGIN_NAMESPACE
+#include <QtCore/qcoreevent.h>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qthread.h>
+#include "qfuturewatcher_p.h"
 
-#ifndef QT_NO_QFUTURE
+QT_BEGIN_NAMESPACE
 
 /*! \class QFutureWatcher
     \reentrant
@@ -576,11 +574,16 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)
 
 */
 
-#else
+QT_END_NAMESPACE
+
+#include "moc_qfuturewatcher.h"
 
-// On Symbian winscw target QT_NO_QFUTURE and QT_NO_CONCURRENT are both defined.
-// However moc will be run without having them set, so provide a dummy stub at
-// least for the slots to prevent linker errors.
+#else // QT_NO_CONCURRENT
+
+// moc will be run without having QT_NO_CONCURRENT set, so provide a dummy stub
+// for the slots to prevent linker errors.
+
+QT_BEGIN_NAMESPACE
 
 void QFutureWatcherBase::cancel() { }
 void QFutureWatcherBase::setPaused(bool) { }
@@ -591,8 +594,6 @@ bool QFutureWatcherBase::event(QEvent *) { return false; }
 void QFutureWatcherBase::connectNotify(const char *) { }
 void QFutureWatcherBase::disconnectNotify(const char *) { }
 
-#endif // QT_NO_QFUTURE
-
 QT_END_NAMESPACE
 
-#include "moc_qfuturewatcher.h"
+#endif // QT_NO_CONCURRENT

diff --git a/src/core/concurrent/qfuturewatcher.h b/src/core/concurrent/qfuturewatcher.h
index bf375f5..aa0f4ad 100644 (file)
--- a/src/core/concurrent/qfuturewatcher.h
+++ b/src/core/concurrent/qfuturewatcher.h
@@ -25,16 +25,13 @@
 #include <QtCore/qfuture.h>
 #include <QtCore/qobject.h>
 
-QT_BEGIN_NAMESPACE
+#ifndef QT_NO_CONCURRENT
 
+QT_BEGIN_NAMESPACE
 
 class QEvent;
-
 class QFutureWatcherBasePrivate;
-
-#ifdef QT_NO_QFUTURE
 class QFutureInterfaceBase;
-#endif
 
 class Q_CORE_EXPORT QFutureWatcherBase : public QObject
 {
@@ -94,8 +91,6 @@ private:
     virtual QFutureInterfaceBase &futureInterface() = 0;
 };
 
-#ifndef QT_NO_QFUTURE
-
 template <typename T>
 class QFutureWatcher : public QFutureWatcherBase
 {
@@ -161,8 +156,8 @@ Q_INLINE_TEMPLATE void QFutureWatcher<void>::setFuture(const QFuture<void> &_fut
     connectOutputInterface();
 }
 
-#endif // QT_NO_QFUTURE
-
 QT_END_NAMESPACE
 
+#endif // QT_NO_CONCURRENT
+
 #endif // QFUTUREWATCHER_H

diff --git a/src/core/concurrent/qfuturewatcher_p.h b/src/core/concurrent/qfuturewatcher_p.h
index 57f7fab..a78bc6d 100644 (file)
--- a/src/core/concurrent/qfuturewatcher_p.h
+++ b/src/core/concurrent/qfuturewatcher_p.h
@@ -36,7 +36,7 @@
 #include "qfutureinterface_p.h"
 #include "qlist.h"
 
-#ifndef QT_NO_QFUTURE
+#ifndef QT_NO_CONCURRENT
 
 #include "qobject_p.h"
 
@@ -66,5 +66,6 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_QFUTURE
-#endif
+#endif // QT_NO_CONCURRENT
+
+#endif // QFUTUREWATCHER_P_H

diff --git a/src/core/concurrent/qtconcurrentexception.cpp b/src/core/concurrent/qtconcurrentexception.cpp
index 96f10d9..0736236 100644 (file)
--- a/src/core/concurrent/qtconcurrentexception.cpp
+++ b/src/core/concurrent/qtconcurrentexception.cpp
@@ -21,7 +21,8 @@
 
 #include "qtconcurrentexception.h"
 
-#ifndef QT_NO_QFUTURE
+#ifndef QT_NO_CONCURRENT
+
 #ifndef QT_NO_EXCEPTIONS
 
 QT_BEGIN_NAMESPACE
@@ -191,4 +192,5 @@ bool ExceptionStore::hasThrown() const { return exceptionHolder.base->hasThrown;
 QT_END_NAMESPACE
 
 #endif // QT_NO_EXCEPTIONS
+
 #endif // QT_NO_CONCURRENT

diff --git a/src/core/concurrent/qtconcurrentexception.h b/src/core/concurrent/qtconcurrentexception.h
index 8ac369b..3a63902 100644 (file)
--- a/src/core/concurrent/qtconcurrentexception.h
+++ b/src/core/concurrent/qtconcurrentexception.h
@@ -24,7 +24,7 @@
 
 #include <QtCore/qglobal.h>
 
-#ifndef QT_NO_QFUTURE
+#ifndef QT_NO_CONCURRENT
 
 #include <QtCore/qatomic.h>
 
@@ -102,4 +102,4 @@ QT_END_NAMESPACE
 
 #endif // QT_NO_CONCURRENT
 
-#endif
+#endif // QTCONCURRENT_EXCEPTION_H

diff --git a/src/core/concurrent/qtconcurrentresultstore.cpp b/src/core/concurrent/qtconcurrentresultstore.cpp
index 286eccc..8e786ef 100644 (file)
--- a/src/core/concurrent/qtconcurrentresultstore.cpp
+++ b/src/core/concurrent/qtconcurrentresultstore.cpp
@@ -21,7 +21,7 @@
 
 #include "qtconcurrentresultstore.h"
 
-#ifndef QT_NO_QFUTURE
+#ifndef QT_NO_CONCURRENT
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/core/concurrent/qtconcurrentresultstore.h b/src/core/concurrent/qtconcurrentresultstore.h
index 30ee617..8d5b801 100644 (file)
--- a/src/core/concurrent/qtconcurrentresultstore.h
+++ b/src/core/concurrent/qtconcurrentresultstore.h
@@ -24,7 +24,7 @@
 
 #include <QtCore/qglobal.h>
 
-#ifndef QT_NO_QFUTURE
+#ifndef QT_NO_CONCURRENT
 
 #include <QtCore/qmap.h>
 #include <QtCore/qvector.h>
@@ -213,4 +213,4 @@ QT_END_NAMESPACE
 
 #endif // QT_NO_CONCURRENT
 
-#endif
+#endif // QTCONCURRENT_RESULTSTORE_H

diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake
index cb58e64..b029be0 100644 (file)
--- a/src/core/global/qconfig.h.cmake
+++ b/src/core/global/qconfig.h.cmake
@@ -127,6 +127,7 @@
 // #cmakedefine QT_NO_MESSAGEBOX
 // #cmakedefine QT_NO_PROGRESSBAR
 // #cmakedefine QT_NO_PROPERTIES
+// #cmakedefine QT_NO_PROXYMODEL
 
 // Misc
 #cmakedefine QT_NO_USING_NAMESPACE
@@ -165,7 +166,6 @@
 #cmakedefine QT_NO_PRINTPREVIEWDIALOG
 #cmakedefine QT_NO_PRINTPREVIEWWIDGET
 #cmakedefine QT_NO_PROGRESSDIALOG
-#cmakedefine QT_NO_PROXYMODEL
 #cmakedefine QT_NO_QFUTURE
 #cmakedefine QT_NO_QUATERNION
 #cmakedefine QT_NO_QUUID_STRING
@@ -234,11 +234,6 @@
 #  define QT_NO_DEBUG_STREAM
 #endif
 
-// Future
-#if !defined(QT_NO_QFUTURE) && defined(QT_NO_CONCURRENT)
-#  define QT_NO_QFUTURE
-#endif
-
 // Animation
 #if !defined(QT_NO_ANIMATION) && defined(QT_NO_PROPERTIES)
 #  define QT_NO_ANIMATION