summaryrefslogtreecommitdiffstats
path: root/src/concurrent/concurrent.pro
diff options
context:
space:
mode:
authorJoão Abecasis <joao.abecasis@nokia.com>2012-02-06 00:40:36 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-14 16:14:58 +0100
commit5fb2122c34a8a129379d637a203b6f50cef02e02 (patch)
tree9c500bac3430ad7c81f1fa4de0dc897da1f0ff2c /src/concurrent/concurrent.pro
parent4a99a42adb865ee58aed023822a1b784338eed8b (diff)
Move QtConcurrent configuration to a single file
This file lives in src/concurrent, alongside the rest of the library. Relevant configuration was moved out of qglobal.h, as it isn't relevant for other parties and thus isn't needed there. This introduces a global header that all QtConcurrent headers now include. This header includes qglobal.h and defines library-specific configuration for all to follow. Change-Id: If6f11e7bbc6139d29004eb1602bd579b75b637c8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/concurrent/concurrent.pro')
-rw-r--r--src/concurrent/concurrent.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro
index 8ef3c5ca59..6bf16e6a0a 100644
--- a/src/concurrent/concurrent.pro
+++ b/src/concurrent/concurrent.pro
@@ -31,6 +31,7 @@ SOURCES += \
qtconcurrentexception.cpp
HEADERS += \
+ qtconcurrent_global.h \
qfuture.h \
qfutureinterface.h \
qfuturesynchronizer.h \