diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-13 08:53:40 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-15 01:03:11 +0200 |
| commit | 86765166b9d219f6af8c69c41794ce2dfd224a63 (patch) | |
| tree | bec8bc639532b3a5fe2dd41376a25990dda4a545 | |
| parent | 344d9b568c263c2516acce86160293e77d5ca773 (diff) | |
Ensure build_all is propagated to all modules when appropriate.
If qtbase was configured to build both debug and release versions of
libraries, it makes sense for any modules we are building to do the
same by default.
Change-Id: Idb5f78a7414b6ed2bacf295ad01f259fca435410
Reviewed-on: http://codereview.qt-project.org/4702
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_config.prf | 1 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -3247,7 +3247,7 @@ if [ "$CFG_DEBUG" = "auto" ]; then fi fi if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then - QMAKE_CONFIG="$QMAKE_CONFIG build_all" + QT_CONFIG="$QT_CONFIG build_all" fi if [ -z "$PKG_CONFIG" ]; then diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index e110de0c5b..9f7a0d096a 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -59,6 +59,7 @@ linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions contains(QT_CONFIG, largefile):CONFIG += largefile +contains(QT_CONFIG, build_all):CONFIG += build_all contains(QT_CONFIG, separate_debug_info):CONFIG += separate_debug_info contains(QT_CONFIG, separate_debug_info_nocopy):CONFIG += separate_debug_info_nocopy diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index a6b87a336f..b22412fe09 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2605,7 +2605,7 @@ void Configure::generateOutputVars() // Other options ------------------------------------------------ if (dictionary[ "BUILDALL" ] == "yes") { - qmakeConfig += "build_all"; + qtConfig += "build_all"; } qmakeConfig += dictionary[ "BUILD" ]; dictionary[ "QMAKE_OUTDIR" ] = dictionary[ "BUILD" ]; |