diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-03-20 11:18:17 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-03-23 13:55:35 +0100 |
| commit | 3f744be923d209d9507962952df5e0e0c3744b02 (patch) | |
| tree | d6b9e5792fad29fcbbc353f68e67171a5b397477 /mkspecs | |
| parent | da1d6bccd2d7759e8e17872f823ef8b59bbefff3 (diff) | |
| parent | 69a5be7ef0475ba748ffbe50017c73e44a23a051 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_helper_lib.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index 8a9672e603..2bb01515be 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: qtConfig(debug_and_release): { + } else: if(msvc|qtConfig(debug_and_release)): { win32: \ MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}d.$$suffix else: darwin: \ |