diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
index 29c2052d2a8..e7fa26d918d 100644
--- a/cmake/Utils.cmake
+++ b/cmake/Utils.cmake
@@ -92,4 +92,12 @@ function(configure_qml_designer Qt6_VERSION)
     env_with_default("QTC_WITH_QMLDESIGNER" ENV_QTC_WITH_QMLDESIGNER ${QTC_WITH_QMLDESIGNER_DEFAULT})
     option(WITH_QMLDESIGNER "Build QmlDesigner" ${ENV_QTC_WITH_QMLDESIGNER})
     add_feature_info("WITH_QMLDESIGNER" ${WITH_QMLDESIGNER} "${QMLDESIGNER_FEATURE_DESC}")
+
+    set(QTC_IS_SUPPORTED_PROJECTSTORAGE_QT_DEFAULT OFF)
+    if(Qt6_VERSION VERSION_GREATER_EQUAL 6.7.3 AND Qt6_VERSION VERSION_LESS 6.8.0)
+        set(QTC_IS_SUPPORTED_PROJECTSTORAGE_QT_DEFAULT ON)
+    endif()
+    env_with_default("QTC_IS_SUPPORTED_PROJECTSTORAGE_QT" ENV_QTC_IS_SUPPORTED_PROJECTSTORAGE_QT ${QTC_IS_SUPPORTED_PROJECTSTORAGE_QT_DEFAULT})
+    option(IS_SUPPORTED_PROJECTSTORAGE_QT "IS_SUPPORTED_PROJECTSTORAGE_QT" ${ENV_QTC_IS_SUPPORTED_PROJECTSTORAGE_QT})
+    add_feature_info("IS_SUPPORTED_PROJECTSTORAGE_QT" ${IS_SUPPORTED_PROJECTSTORAGE_QT} "is ${IS_SUPPORTED_PROJECTSTORAGE_QT}")
 endfunction()
diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
index 8f3f7928d10..d46dd38fe0f 100644
--- a/src/plugins/qmldesigner/CMakeLists.txt
+++ b/src/plugins/qmldesigner/CMakeLists.txt
@@ -127,7 +127,7 @@ extend_qtc_library(QmlDesignerCore
 )
 
 extend_qtc_library(QmlDesignerCore
-  CONDITION Qt6_VERSION VERSION_GREATER_EQUAL 6.7.0 AND Qt6_VERSION VERSION_LESS 6.8.0
+  CONDITION IS_SUPPORTED_PROJECTSTORAGE_QT
   PUBLIC_DEFINES QDS_BUILD_QMLPARSER
 )
 extend_qtc_library(QmlDesignerCore
diff --git a/tests/unit/tests/unittests/projectstorage/CMakeLists.txt b/tests/unit/tests/unittests/projectstorage/CMakeLists.txt
index a877223dfe1..ef5d7290ada 100644
--- a/tests/unit/tests/unittests/projectstorage/CMakeLists.txt
+++ b/tests/unit/tests/unittests/projectstorage/CMakeLists.txt
@@ -15,14 +15,15 @@ extend_qtc_test(unittest
 )
 
 extend_qtc_test(unittest
-  CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND Qt6_VERSION VERSION_GREATER_EQUAL 6.7.0  AND Qt6_VERSION VERSION_LESS 6.8.0
+  CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND IS_SUPPORTED_PROJECTSTORAGE_QT
   DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate
   SOURCES
     qmldocumentparser-test.cpp
     qmltypesparser-test.cpp
 )
+
 extend_qtc_test(unittest
-  CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND Qt6_VERSION VERSION_GREATER_EQUAL 6.7.0 AND Qt6_VERSION VERSION_LESS 6.8.0
+  CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND IS_SUPPORTED_PROJECTSTORAGE_QT
   SOURCES_PREFIX "${QmlDesignerDir}/designercore"
   DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate
   DEFINES QDS_BUILD_QMLPARSER