diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-08-24 11:45:54 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-08-27 22:13:50 +0200 |
| commit | b63e99d04130c524d860b572f51f9392ab61985b (patch) | |
| tree | 444a2d01aad943fa5890c46c7b52a2893254c4a5 /mkspecs | |
| parent | de751066d65ca22970f501a40537155377bedc5c (diff) | |
Make configure -force-asserts affect the Qt build only
Before this change, configure -force-asserts would affect qmake-based user
projects too, potentially forcing the user to remove the
QT_FORCE_ASSERTS define in their own projects.
[ChangeLog][configure] The -force-asserts option now affects the Qt
build only, not user projects.
Change-Id: Iecca3c9f7e8261996c5d8bcba8adbc0db1dc1c99
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/qt_common.prf | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 9d852cf23d..532a241fc0 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -13,7 +13,6 @@ win32 { } } CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG -qtConfig(force_asserts): DEFINES += QT_FORCE_ASSERTS no_keywords:DEFINES += QT_NO_KEYWORDS plugin { #Qt plugins static:DEFINES += QT_STATICPLUGIN diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index c9b8018b63..f51b32660b 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -69,6 +69,8 @@ contains(TEMPLATE, .*lib)|darwin { macos: DEFINES += GL_SILENCE_DEPRECATION uikit: DEFINES += GLES_SILENCE_DEPRECATION +qtConfig(force_asserts): DEFINES += QT_FORCE_ASSERTS + # The remainder of this file must not apply to host tools/libraries, # as the host compiler's version and capabilities are not checked. host_build:cross_compile: return() |