summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-03-19 16:10:31 +0100
committerMitch Curtis <mitch.curtis@qt.io>2020-03-19 16:10:31 +0100
commit1480922511853b20a5484d941f2d3c629768b7fe (patch)
tree4daff52de8bff80dfe5dea3ebc3fa82b97cf0047 /mkspecs/features
parent05dd80871c870a564a46e388d7fd124a58fc970d (diff)
parent1a18e138f4d17c219c6ffd6e4396c30b960818b4 (diff)
Merge remote-tracking branch 'origin/5.14.2' into 5.14
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/qt_helper_lib.prf2
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: \