From 7f47f51e62e5eaf199e291cf98a8ecc8336048e1 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 6 Feb 2012 14:40:12 +0200 Subject: Add concurrent to QT_CONFIG cherry-picked from qtbase d21f28956e494baae311dc6d8f9dfbd4448965b5 cherry-picked from qtbase 7c64ab4966e24834768eb1a09b3d2fd08471787a Change-Id: I8f7f9991fa197e737fe7f9af0ab949a5d48e7069 Reviewed-by: Oswald Buddenhagen --- configure | 2 ++ tools/configure/configureapp.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configure b/configure index 6403a2f..a706908 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 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() -- cgit v0.12