forked from qt-creator/qt-creator
QmlDesigner: increase MSVC_REQUIRED_VERSION to MSVC2022
Change-Id: Iec2d9aaad89c2874286bb6a00e77cda91187f17a Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
@@ -65,6 +65,7 @@ function(configure_qml_designer Qt6_VERSION)
|
|||||||
set(QMLDESIGNER_GCC_REQUIRED_VERSION 10.0)
|
set(QMLDESIGNER_GCC_REQUIRED_VERSION 10.0)
|
||||||
set(QMLDESIGNER_CLANG_REQUIRED_VERSION 13.0)
|
set(QMLDESIGNER_CLANG_REQUIRED_VERSION 13.0)
|
||||||
set(QMLDESIGNER_APPLECLANG_REQUIRED_VERSION 15.0)
|
set(QMLDESIGNER_APPLECLANG_REQUIRED_VERSION 15.0)
|
||||||
|
set(QMLDESIGNER_MSVC_REQUIRED_VERSION 1930) # means MSVC 2022
|
||||||
|
|
||||||
string(CONCAT QMLDESIGNER_FEATURE_DESC
|
string(CONCAT QMLDESIGNER_FEATURE_DESC
|
||||||
"Needs a Qt ${QMLDESIGNER_QT6_REQUIRED_VERSION} or newer")
|
"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})
|
CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${QMLDESIGNER_CLANG_REQUIRED_VERSION})
|
||||||
set(QTC_WITH_QMLDESIGNER_DEFAULT OFF)
|
set(QTC_WITH_QMLDESIGNER_DEFAULT OFF)
|
||||||
string(APPEND QMLDESIGNER_FEATURE_DESC " and at least Clang ${QMLDESIGNER_CLANG_REQUIRED_VERSION}")
|
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()
|
else()
|
||||||
set(QTC_WITH_QMLDESIGNER_DEFAULT ON)
|
set(QTC_WITH_QMLDESIGNER_DEFAULT ON)
|
||||||
endif()
|
endif()
|
||||||
|
Reference in New Issue
Block a user