summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-02-15 19:28:28 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-18 15:52:43 +0100
commit489d8a0627c46092d20f476d5521ecafd42e5ce5 (patch)
tree60e78d7ad6044def49a6516e1f3e178e58986c7f /configure
parent2e4ce301f98d3f463a7151c21dc8cc407cd8702c (diff)
add QT_CONFIG's static/shared to CONFIG on startup
... instead of as a fallback in default_post. it was this way in qt4, and it requires less code to be written in the end. we are already doing it for debug/release as well. Change-Id: I6e02849d61d14a18375cf64a5990768931ebac48 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure b/configure
index 0d30c97504..4a1836e5b0 100755
--- a/configure
+++ b/configure
@@ -5330,9 +5330,11 @@ fi
if [ "$CFG_SHARED" = "yes" ]; then
QMAKE_OUTDIR="${QMAKE_OUTDIR}-shared"
QT_CONFIG="$QT_CONFIG shared"
+ QTCONFIG_CONFIG="$QTCONFIG_CONFIG shared"
elif [ "$CFG_SHARED" = "no" ]; then
QMAKE_OUTDIR="${QMAKE_OUTDIR}-static"
QT_CONFIG="$QT_CONFIG static"
+ QTCONFIG_CONFIG="$QTCONFIG_CONFIG static"
fi
#FIXME: qpa is implicit this should all be removed