diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-01-16 09:33:59 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-02-27 09:59:08 +0100 |
| commit | d32a6793a43dc64dab3364fe3052bc464192ba90 (patch) | |
| tree | ed7cf04226e9d066d965a0d65e5e47a85042001b /mkspecs | |
| parent | 0efdf54a16d785598a2e310733a43e51d8a521b8 (diff) | |
MinGW: Fix debug-and-release configuration
Make sure that, if Qt was configured with -debug-and-release, winmain
and user apps are generated by default in debug-and-release mode, too.
This amends 9b4ec1393fde2af7deb39b9a2f98bcc93635603f .
Change-Id: I0f169d63ca98c9bde41114225004a0844425db33
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
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: \ |