summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@digia.com>2012-02-06 14:40:12 +0200
committerQt by Nokia <qt-info@nokia.com>2012-02-06 15:24:50 +0100
commit7f47f51e62e5eaf199e291cf98a8ecc8336048e1 (patch)
tree05c810fe3d12005f5f02426a455bae9c9cc32d95 /configure
parent7f8612853273f9dc120a7bc096f10821eb48fd2b (diff)
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 'configure')
-rwxr-xr-xconfigure2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure b/configure
index 6403a2f6fe..a7069085ae 100755
--- a/configure
+++ b/configure
@@ -7610,6 +7610,8 @@ CFG_CONCURRENT="yes"
if [ "$canBuildQtConcurrent" = "no" ]; then
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CONCURRENT"
CFG_CONCURRENT="no"
+else
+ QT_CONFIG="$QT_CONFIG concurrent"
fi
if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then