move automatic QT_NO_QFUTURE definition to qconfig header

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake
index a06204e..88977b7 100644 (file)
--- a/src/core/global/qconfig.h.cmake
+++ b/src/core/global/qconfig.h.cmake
@@ -351,6 +351,11 @@
 #define QT_NO_CONCURRENT
 #endif
 
+// Future
+#if !defined(QT_NO_QFUTURE) && defined(QT_NO_CONCURRENT)
+#define QT_NO_QFUTURE
+#endif
+
 // Process
 #if !defined(QT_NO_PROCESS) && defined(QT_NO_THREAD)
 #define QT_NO_PROCESS

diff --git a/src/core/global/qglobal.h.cmake b/src/core/global/qglobal.h.cmake
index f40972c..b9ab2b2 100644 (file)
--- a/src/core/global/qglobal.h.cmake
+++ b/src/core/global/qglobal.h.cmake
@@ -1316,10 +1316,6 @@ inline int qIntCast(float f) { return int(f); }
 Q_CORE_EXPORT void qsrand(uint seed);
 Q_CORE_EXPORT int qrand();
 
-#ifdef QT_NO_CONCURRENT
-#  define QT_NO_QFUTURE
-#endif
-
 #if defined (__ELF__)
 #  if defined (Q_OS_LINUX) || defined (Q_OS_SOLARIS) || defined (Q_OS_FREEBSD) || defined (Q_OS_OPENBSD)
 #    define Q_OF_ELF