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

QmlDesigner: fix IS_SUPPORTED_PROJECTSTORAGE_QT SCOPE

Browse Source 
It can be a none cached variable in the PARENT_SCOPE
Depending code is reevaluated once the variable changed.
(Did not expect that, but that is one of the main magic of CMake)

Reduced FATAL_ERROR to a WARNING because PROJECTSTORAGE_QT
out of range Qt version users should still compile most of the code.

Change-Id: I83323775c8f69d8dd58a9a158797b280c8c99d68
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Tim Jenßen
2025-02-04 07:09:28 +01:00
committed by Tim Jenssen
parent ff7c888f3a
commit d53de5e230
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/Utils.cmake
View File

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