AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure build_all is propagated to all modules when appropriate.

Browse Source 
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>
This commit is contained in:
Rohan McGovern 2011-09-13 08:53:40 +10:00 committed by Qt by Nokia
parent 344d9b568c
commit 86765166b9
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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

1
mkspecs/features/qt_module_config.prf
View File

@ -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

2
tools/configure/configureapp.cpp
View File

@ -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" ];