From d53de5e2308ca15f0fa27b6a200fac3d42ab0d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Jen=C3=9Fen?= Date: Tue, 4 Feb 2025 07:09:28 +0100 Subject: [PATCH] QmlDesigner: fix IS_SUPPORTED_PROJECTSTORAGE_QT SCOPE 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 Reviewed-by: Marco Bubke --- cmake/Utils.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake index 9f501172b00..12f4dcf5380 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake @@ -100,9 +100,10 @@ function(configure_qml_designer Qt6_VERSION) set(QTC_IS_SUPPORTED_PROJECTSTORAGE_QT_DEFAULT ON) 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(FATAL_ERROR + message(WARNING "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 "