summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@digia.com>2012-02-06 12:40:12 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-02-06 14:24:50 (GMT)
commit7f47f51e62e5eaf199e291cf98a8ecc8336048e1 (patch)
tree05c810fe3d12005f5f02426a455bae9c9cc32d95 /tools
parent7f8612853273f9dc120a7bc096f10821eb48fd2b (diff)
downloadQt-7f47f51e62e5eaf199e291cf98a8ecc8336048e1.zip
Qt-7f47f51e62e5eaf199e291cf98a8ecc8336048e1.tar.gz
Qt-7f47f51e62e5eaf199e291cf98a8ecc8336048e1.tar.bz2
Add concurrent to QT_CONFIG
cherry-picked from qtbase d21f28956e494baae311dc6d8f9dfbd4448965b5 cherry-picked from qtbase 7c64ab4966e24834768eb1a09b3d2fd08471787a Change-Id: I8f7f9991fa197e737fe7f9af0ab949a5d48e7069 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 4ef61eb..0b4fbd8 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2795,6 +2795,8 @@ void Configure::generateOutputVars()
// We currently have no switch for QtSvg, so add it unconditionally.
qtConfig += "svg";
+ // We currently have no switch for QtConcurrent, so add it unconditionally.
+ qtConfig += "concurrent";
// Add config levels --------------------------------------------
QStringList possible_configs = QStringList()