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

QmlDesigner: make IS_SUPPORTED_PROJECTSTORAGE_QT more strict

Browse Source 
- in DESIGNSTUDIO/PROJECTSTORAGE wrong Qt version results in a fatal
  message
- Do not give the option to overwrite it. Only the maintainer will do
  that by changing the version variables

Task-number: QDS-14674
Change-Id: Iadb6d08a1774a65b25f0431170cf57139201d379
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Tim Jenssen
2025-03-17 16:18:03 +01:00
parent dca6151993
commit 06b15a1a1b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmake/Utils.cmake
View File

@@ -107,19 +107,22 @@ function(configure_qml_designer Qt6_VERSION)
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 ${PROJECTSTORAGE_QT_MIN_VERSION} AND Qt6_VERSION VERSION_LESS ${PROJECTSTORAGE_QT_MAX_VERSION})
set(QTC_IS_SUPPORTED_PROJECTSTORAGE_QT_DEFAULT ON)
set(IS_SUPPORTED_PROJECTSTORAGE_QT ON)
else()
set(IS_SUPPORTED_PROJECTSTORAGE_QT OFF)
endif()
env_with_default("QTC_IS_SUPPORTED_PROJECTSTORAGE_QT" IS_SUPPORTED_PROJECTSTORAGE_QT ${QTC_IS_SUPPORTED_PROJECTSTORAGE_QT_DEFAULT})
set(IS_SUPPORTED_PROJECTSTORAGE_QT "${IS_SUPPORTED_PROJECTSTORAGE_QT}" PARENT_SCOPE)
if(USE_PROJECTSTORAGE AND NOT IS_SUPPORTED_PROJECTSTORAGE_QT)
message(WARNING
if(BUILD_DESIGNSTUDIO)
set(_level FATAL_ERROR)
else()
set(_level WARNING)
endif()
message(${_level}
"USE_PROJECTSTORAGE is enabled, but current Qt ${Qt6_VERSION} is not supported by the project storage "
"(required: ${PROJECTSTORAGE_QT_MIN_VERSION} - ${PROJECTSTORAGE_QT_MAX_VERSION})."
"You can override this check by setting the environment variable "
"QTC_IS_SUPPORTED_PROJECTSTORAGE_QT=ON."
)
endif()