diff --git a/configure.cmake b/configure.cmake
index 9610d375769..2fc01379fa8 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -354,7 +354,7 @@ qt_feature_config("developer-build" QMAKE_PUBLIC_QT_CONFIG
 qt_feature("debug"
     LABEL "Build for debugging"
     AUTODETECT QT_FEATURE_developer_build OR ( WIN32 AND NOT GCC ) OR APPLE
-    CONDITION Debug STREQUAL CMAKE_BUILD_TYPE OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES
+    CONDITION CMAKE_BUILD_TYPE STREQUAL Debug OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES
 )
 qt_feature("debug_and_release" PUBLIC
     LABEL "Compile libs in debug and release mode"
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index f0fb4f08171..b024c764597 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -771,7 +771,7 @@ def parseFeature(ctx, feature, data, cm_fh):
             "autoDetect": "1",     # Setting this to None has weird effects...
             "condition": "QT_GENERATOR_IS_MULTI_CONFIG"
         },
-        "debug": {"condition": "Debug STREQUAL CMAKE_BUILD_TYPE OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES"},
+        "debug": {"condition": "CMAKE_BUILD_TYPE STREQUAL Debug OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES"},
         "dlopen": {"condition": "UNIX"},
         "doubleconversion": None,
         "enable_gdb_index": None,