feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: add IS_SUPPORTED_PROJECTSTORAGE_QT

Browse Source 
It also can be overwritten by option:
IS_SUPPORTED_PROJECTSTORAGE_QT
or environment variable:
QTC_IS_SUPPORTED_PROJECTSTORAGE_QT

Change-Id: Iabc7d59ff100017811167a6ec4e7447ccc3e55ee
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tim Jenssen
2024-08-05 18:39:17 +02:00
parent 920da89143
commit 0d571b5e95
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/Utils.cmake
View File

@@ -92,4 +92,12 @@ function(configure_qml_designer Qt6_VERSION)
env_with_default("QTC_WITH_QMLDESIGNER" ENV_QTC_WITH_QMLDESIGNER ${QTC_WITH_QMLDESIGNER_DEFAULT}) env_with_default("QTC_WITH_QMLDESIGNER" ENV_QTC_WITH_QMLDESIGNER ${QTC_WITH_QMLDESIGNER_DEFAULT})
option(WITH_QMLDESIGNER "Build QmlDesigner" ${ENV_QTC_WITH_QMLDESIGNER}) option(WITH_QMLDESIGNER "Build QmlDesigner" ${ENV_QTC_WITH_QMLDESIGNER})
add_feature_info("WITH_QMLDESIGNER" ${WITH_QMLDESIGNER} "${QMLDESIGNER_FEATURE_DESC}") 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() endfunction()

2
src/plugins/qmldesigner/CMakeLists.txt
View File

@@ -127,7 +127,7 @@ extend_qtc_library(QmlDesignerCore
) )
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 PUBLIC_DEFINES QDS_BUILD_QMLPARSER
) )
extend_qtc_library(QmlDesignerCore extend_qtc_library(QmlDesignerCore

5
tests/unit/tests/unittests/projectstorage/CMakeLists.txt
View File

@@ -15,14 +15,15 @@ extend_qtc_test(unittest
) )
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 DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate
SOURCES SOURCES
qmldocumentparser-test.cpp qmldocumentparser-test.cpp
qmltypesparser-test.cpp qmltypesparser-test.cpp
) )
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
SOURCES_PREFIX "${QmlDesignerDir}/designercore" SOURCES_PREFIX "${QmlDesignerDir}/designercore"
DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate
DEFINES QDS_BUILD_QMLPARSER DEFINES QDS_BUILD_QMLPARSER