diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-28 15:25:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-01 21:40:04 +0100 |
| commit | e80d7bb8bb7fcecab8f98a614e34d4e3929d5ec4 (patch) | |
| tree | 0f0e9d867ed04e6d0b57244eca1f2de2d8e3968e /configure | |
| parent | 942e1ea5de0fe7fa1afd5ac4fb484be0d157cf95 (diff) | |
| download | qt4-tools-e80d7bb8bb7fcecab8f98a614e34d4e3929d5ec4.tar.gz | |
unmess CONFIG/QT_CONFIG static/shared
bring it to the state of 5.0.2: both QT_CONFIG and CONFIG in qconfig.pri
contain the respective flag, so it is a) visible how qt was built and b)
user code has a consistent default.
before, on windows we had it only in qconfig.pri's CONFIG (so it was
harder to find the qt config), and on unix we had it only in
.qmake.cache's CONFIG (so it was impossible to find the qt config in a
clean way, and there was no default (other than some arbitrary mess
inside qmake itself)).
Change-Id: Iad06de8c4435cec3e1407babde037ac96cb5bf66
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -7310,10 +7310,12 @@ elif [ "$CFG_DEBUG" = "no" ]; then fi if [ "$CFG_SHARED" = "yes" ]; then QMAKE_OUTDIR="${QMAKE_OUTDIR}-shared" - QMAKE_CONFIG="$QMAKE_CONFIG shared dll" + QTCONFIG_CONFIG="$QTCONFIG_CONFIG shared" + QT_CONFIG="$QT_CONFIG shared" elif [ "$CFG_SHARED" = "no" ]; then QMAKE_OUTDIR="${QMAKE_OUTDIR}-static" - QMAKE_CONFIG="$QMAKE_CONFIG static" + QTCONFIG_CONFIG="$QTCONFIG_CONFIG static" + QT_CONFIG="$QT_CONFIG static" fi if [ "$PLATFORM_QWS" = "yes" ]; then QMAKE_OUTDIR="${QMAKE_OUTDIR}-emb-$CFG_EMBEDDED" |