diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-15 19:28:28 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-18 15:52:43 +0100 |
commit | 489d8a0627c46092d20f476d5521ecafd42e5ce5 (patch) | |
tree | 60e78d7ad6044def49a6516e1f3e178e58986c7f /configure | |
parent | 2e4ce301f98d3f463a7151c21dc8cc407cd8702c (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-x | configure | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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 |