diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-08-10 11:49:46 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-10 06:10:35 +0200 |
| commit | 81d15e059fe2367788b3b0d1aa34171a2cc9692b (patch) | |
| tree | 11e684eb5071b5aafe102111a332446107993fd3 | |
| parent | de9caf16fe125b7b139287936eda555614648534 (diff) | |
configure: fixed debug-and-release default for qpa on mac
debug/release is always supposed to default on for platforms where
debug/release affects linkage (i.e. mac and windows). Previously, it
did not correctly default on for qpa mac builds.
Change-Id: I8d3c418f3fb787136ab120872fdd4d2ebf82c90e
Reviewed-on: http://codereview.qt.nokia.com/2796
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
| -rwxr-xr-x | configure | 34 |
1 files changed, 17 insertions, 17 deletions
@@ -2510,23 +2510,6 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "ye echo fi -# detect build style -if [ "$CFG_DEBUG" = "auto" ]; then - if [ "$PLATFORM_MAC" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then - CFG_DEBUG_RELEASE=yes - CFG_DEBUG=yes - elif [ "$CFG_DEV" = "yes" ]; then - CFG_DEBUG_RELEASE=no - CFG_DEBUG=yes - else - CFG_DEBUG_RELEASE=no - CFG_DEBUG=no - fi -fi -if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then - QMAKE_CONFIG="$QMAKE_CONFIG build_all" -fi - if [ "$CFG_SILENT" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG silent" fi @@ -3243,6 +3226,23 @@ fi # tests that don't need qmake (must be run before displaying help) #------------------------------------------------------------------------------- +# detect build style +if [ "$CFG_DEBUG" = "auto" ]; then + if [ "$CFG_ARCH" = "macosx" -o "$XPLATFORM_MINGW" = "yes" ]; then + CFG_DEBUG_RELEASE=yes + CFG_DEBUG=yes + elif [ "$CFG_DEV" = "yes" ]; then + CFG_DEBUG_RELEASE=no + CFG_DEBUG=yes + else + CFG_DEBUG_RELEASE=no + CFG_DEBUG=no + fi +fi +if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG build_all" +fi + if [ -z "$PKG_CONFIG" ]; then # See if PKG_CONFIG is set in the mkspec: PKG_CONFIG=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%PKG_CONFIG[^_].*=%%p' | tr '\n' ' '` |