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

QT_CONFIG simplification re debug_and_release and build_all

Browse Source 
don't pretend that these two flags can be set separately - the
configures set them in tandem.

Change-Id: Ib0beae0152de09026d4627fd3ae0feabd9ce1b81
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-05-11 17:53:58 +02:00
parent 72492735b7
commit b67a0836d9
6 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mkspecs/features/qml_plugin.prf
View File

@ -15,8 +15,7 @@ TEMPLATE = lib
CONFIG += plugin CONFIG += plugin
if(win32|mac):!macx-xcode { if(win32|mac):!macx-xcode {
contains(QT_CONFIG, debug_and_release):CONFIG += debug_and_release contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release build_all
contains(QT_CONFIG, build_all):CONFIG += build_all
} }
CONFIG += relative_qt_rpath # Qt's QML plugins should be relocatable CONFIG += relative_qt_rpath # Qt's QML plugins should be relocatable

2
mkspecs/features/qt_app.prf
View File

@ -28,7 +28,7 @@ host_build:force_bootstrap {
} }
target.path = $$[QT_HOST_BINS] target.path = $$[QT_HOST_BINS]
} else { } else {
!build_pass:contains(QT_CONFIG, debug_and_release):contains(QT_CONFIG, build_all): CONFIG += release !build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release
target.path = $$[QT_INSTALL_BINS] target.path = $$[QT_INSTALL_BINS]
CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable
} }

3
mkspecs/features/qt_helper_lib.prf
View File

@ -17,8 +17,7 @@ CONFIG -= qt
CONFIG -= warning_clean # Don't presume 3rd party code to be clean CONFIG -= warning_clean # Don't presume 3rd party code to be clean
load(qt_common) load(qt_common)
contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release build_all
contains(QT_CONFIG, build_all): CONFIG += build_all
DESTDIR = $$MODULE_BASE_OUTDIR/lib DESTDIR = $$MODULE_BASE_OUTDIR/lib
DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin

5
mkspecs/features/qt_module.prf
View File

@ -38,7 +38,7 @@ host_build {
QT += bootstrap-private QT += bootstrap-private
} }
} else { } else {
!build_pass:contains(QT_CONFIG, build_all): CONFIG += release !build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release
} }
} }
@ -89,8 +89,7 @@ INCLUDEPATH *= $$eval(QT.$${MODULE}.includes) $$eval(QT.$${MODULE}_private.inclu
# If Qt was configured with -debug-and-release then build the module the same way # If Qt was configured with -debug-and-release then build the module the same way
# - unless this is a host library # - unless this is a host library
!host_build:if(win32|mac):!macx-xcode { !host_build:if(win32|mac):!macx-xcode {
contains(QT_CONFIG, debug_and_release):CONFIG += debug_and_release contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release build_all
contains(QT_CONFIG, build_all):CONFIG += build_all
} }
QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF

5
mkspecs/features/qt_plugin.prf
View File

@ -24,10 +24,9 @@ win32:CONFIG(shared, static|shared) {
} }
tool_plugin { tool_plugin {
!build_pass:contains(QT_CONFIG, build_all): CONFIG += release !build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release
} else:if(win32|mac):!macx-xcode { } else:if(win32|mac):!macx-xcode {
contains(QT_CONFIG, debug_and_release):CONFIG += debug_and_release contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release build_all
contains(QT_CONFIG, build_all):CONFIG += build_all
} }
CONFIG += relative_qt_rpath # Qt's plugins should be relocatable CONFIG += relative_qt_rpath # Qt's plugins should be relocatable

2
src/winmain/winmain.pro
View File

@ -8,7 +8,7 @@ DESTDIR = $$QT.core.libs
CONFIG += static CONFIG += static
QT = core QT = core
contains(QT_CONFIG, build_all):CONFIG += build_all contains(QT_CONFIG, debug_and_release): CONFIG += build_all
win32-msvc*:QMAKE_CFLAGS_DEBUG -= -Zi win32-msvc*:QMAKE_CFLAGS_DEBUG -= -Zi
win32-msvc*:QMAKE_CXXFLAGS_DEBUG -= -Zi win32-msvc*:QMAKE_CXXFLAGS_DEBUG -= -Zi