AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't set CONFIG+=release during build passes

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-11-19 17:19:12 +01:00 committed by The Qt Project
parent 85e9ba4958
commit 1c70033bb6
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qt_tool.prf
View File

@ -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 {

3
src/tools/bootstrap/bootstrap.pro
View File

@ -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