From c650612435edad0f99f81ebbe9404ba27c9a282c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Jen=C3=9Fen?= Date: Thu, 9 Jan 2025 13:33:59 +0100 Subject: [PATCH] QmlDesigner: increase MSVC_REQUIRED_VERSION to MSVC2022 Change-Id: Iec2d9aaad89c2874286bb6a00e77cda91187f17a Reviewed-by: Marco Bubke --- cmake/Utils.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake index 53c8f9f8012..87bbb3d6c85 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake @@ -65,6 +65,7 @@ function(configure_qml_designer Qt6_VERSION) set(QMLDESIGNER_GCC_REQUIRED_VERSION 10.0) set(QMLDESIGNER_CLANG_REQUIRED_VERSION 13.0) set(QMLDESIGNER_APPLECLANG_REQUIRED_VERSION 15.0) + set(QMLDESIGNER_MSVC_REQUIRED_VERSION 1930) # means MSVC 2022 string(CONCAT QMLDESIGNER_FEATURE_DESC "Needs a Qt ${QMLDESIGNER_QT6_REQUIRED_VERSION} or newer") @@ -82,6 +83,10 @@ function(configure_qml_designer Qt6_VERSION) CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${QMLDESIGNER_CLANG_REQUIRED_VERSION}) set(QTC_WITH_QMLDESIGNER_DEFAULT OFF) string(APPEND QMLDESIGNER_FEATURE_DESC " and at least Clang ${QMLDESIGNER_CLANG_REQUIRED_VERSION}") + elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND + CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${QMLDESIGNER_MSVC_REQUIRED_VERSION}) + set(QTC_WITH_QMLDESIGNER_DEFAULT OFF) + string(APPEND QMLDESIGNER_FEATURE_DESC " and at least MSVC 2022(ver. ${QMLDESIGNER_MSVC_REQUIRED_VERSION})") else() set(QTC_WITH_QMLDESIGNER_DEFAULT ON) endif()