From: Ivailo Monev <xakepa10@laimg.moc>
Date: Thu, 5 Dec 2019 09:46:29 +0000 (+0000)
Subject: move automatic QT_NO_QFUTURE definition to qconfig header
X-Git-Tag: 4.12.0~4848
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4979a7ecb24b8364e2b5d581873d8d6af78e81f3;p=kde%2FKatie.git

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 a06204eae..88977b788 100644
--- 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 f40972c1c..b9ab2b23e 100644
--- 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