diff --git a/configure.json b/configure.json
index 644c864125a..1ae09ef3869 100644
--- a/configure.json
+++ b/configure.json
@@ -776,8 +776,8 @@
         },
         "debug_and_release": {
             "label": "Compile libs in debug and release mode",
-            "autoDetect": "input.debug == ''",
-            "condition": "config.darwin || (config.win32 && !config.gcc)",
+            "autoDetect": "input.debug == '' && !(config.win32 && config.gcc)",
+            "condition": "config.darwin || config.win32",
             "output": [ "publicFeature", "publicQtConfig", "debugAndRelease" ]
         },
         "force_debug_info": {
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 661b7dd961a..45d44927889 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -5,7 +5,7 @@ defineReplace(qtPlatformTargetSuffix) {
     else: CONFIG(debug, debug|release) {
         !debug_and_release|build_pass {
             mac: return($${suffix}_debug)
-            win32:!gcc: return($${suffix}d)
+            win32: return($${suffix}d)
         }
     }
     return($$suffix)