diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-02-27 14:22:01 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-02-27 14:22:01 +0100 |
| commit | 5c6c0289f09d9bf18aaa35eed792e40840af5dce (patch) | |
| tree | be49cdea36de09b01b570af3bdc7f0a95f5dd02e /mkspecs | |
| parent | 469c3338407a5cf74c5e35c43ebb48c14e21ecac (diff) | |
| parent | e30aa59a897ca3849fb99c6393cfb426ed22d33b (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I4212d070d5752275085e754b96f0392113604dba
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/g++-win32.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_helper_lib.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf index 6369436863..c3a1f3a373 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -17,7 +17,7 @@ include(g++-base.conf) MAKEFILE_GENERATOR = MINGW QMAKE_PLATFORM = win32 mingw -CONFIG += precompile_header +CONFIG += debug_and_release debug_and_release_target precompile_header DEFINES += UNICODE _UNICODE WIN32 MINGW_HAS_SECURE_API=1 QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 # can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index 216c24c7aa..8a9672e603 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -60,7 +60,7 @@ win32|CONFIG(static, static|shared) { "QMAKE_DEFINES_$${ucmodule} = $$val_escape(MODULE_DEFINES)" android { MODULE_PRI_CONT += "QMAKE_LIBS_$${ucmodule} =" - } else: debug_and_release { + } else: qtConfig(debug_and_release): { win32: \ MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}d.$$suffix else: darwin: \ |