diff options
| author | Marco Bubke <marco.bubke@qt.io> | 2023-04-19 17:08:03 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@qt.io> | 2023-04-19 17:19:07 +0000 |
| commit | 4393df48be6ba2c2f2ad43982256f100a6e2d978 (patch) | |
| tree | 0cff6303aafc2ed5b29a25767a9fb222f46f19b2 | |
| parent | ccf64cf6424bb1106d4d6894a086959d33608ca5 (diff) | |
| download | qt-creator-4393df48be6ba2c2f2ad43982256f100a6e2d978.tar.gz | |
QmlDesigner: Reduce version demands
We now expect Qt 6.4.3 and MacOS 10.15 or higher.
Change-Id: I339e3ca7f668d9451859c51472712c831a6caf8c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| -rw-r--r-- | src/plugins/qmldesigner/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 59a517a529..bac868378e 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -90,7 +90,8 @@ extend_qtc_library(QmlDesignerCore ) extend_qtc_library(QmlDesignerCore - CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0 + CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND Qt6_VERSION VERSION_GREATER_EQUAL 6.4.3 + AND NOT (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_VERSION VERSION_LESS 19) DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate PUBLIC_DEFINES QDS_HAS_QMLPRIVATE diff --git a/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp b/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp index 3ed1563998..ac1761318d 100644 --- a/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp +++ b/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp @@ -20,7 +20,7 @@ namespace QmlDesigner { -#ifdef QDS_HAS_QMLPRIVATE +#if defined(QDS_HAS_QMLPRIVATE) && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) namespace QmlDom = QQmlJS::Dom; |