diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-19 17:19:12 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-20 16:46:33 +0100 |
| commit | 1c70033bb607d01b0272f17353c13c41603908ec (patch) | |
| tree | 5f2c93325d453bb46a10f7a5775e8bcb500ec357 | |
| parent | 85e9ba49580e307e1213c87cdbfdc301848f497f (diff) | |
don't set CONFIG+=release during build passes
otherwise we get inconsistent builds.
Task-number: QTBUG-28046
Change-Id: I7952000bfc8e02ced5fd2c1bbffab7384f2730c1
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | mkspecs/features/qt_tool.prf | 2 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index bae6138067..649c95d1d3 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -7,7 +7,7 @@ CONFIG += qt warn_on console isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle host_build { - CONFIG += release + !build_pass: CONFIG += release QT = bootstrap-private target.path = $$[QT_HOST_BINS] } else { diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index e57f4dfb2b..329521ab2e 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -3,6 +3,7 @@ option(host_build) TARGET = QtBootstrap QT = CONFIG += no_module_headers internal_module +!build_pass: CONFIG += release MODULE_DEFINES = \ QT_BOOTSTRAPPED \ @@ -33,8 +34,6 @@ MODULE_PRIVATE_INCLUDES = \ \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION \ \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION/QtXml -CONFIG += release - load(qt_module) INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global |