From 67c7beeffeb96ce3207fea1825a9b068157ca451 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 10 Jul 2024 16:17:31 +0200 Subject: [PATCH] QmlDesigner: Use Qt 6.7 for project storage Change-Id: Ibf0df9a05dda2c3bbd2a55935e9471ebf40dcf64 Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/CMakeLists.txt | 2 +- .../designercore/projectstorage/qmltypesparser.cpp | 2 +- tests/unit/tests/unittests/projectstorage/CMakeLists.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 2281b72110a..8adf4aa2c5f 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -126,7 +126,7 @@ extend_qtc_library(QmlDesignerCore ) extend_qtc_library(QmlDesignerCore - CONDITION Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0 AND Qt6_VERSION VERSION_LESS 6.6.0 + CONDITION Qt6_VERSION VERSION_GREATER_EQUAL 6.7.0 AND Qt6_VERSION VERSION_LESS 6.8.0 PUBLIC_DEFINES QDS_BUILD_QMLPARSER ) extend_qtc_library(QmlDesignerCore diff --git a/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp b/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp index b3ec4f00242..228609a9ce8 100644 --- a/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp +++ b/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp @@ -288,7 +288,7 @@ createFunctionAndSignals(const QMultiHash &qmlMethods if (qmlMethod.isJavaScriptFunction()) continue; - if (qmlMethod.methodType() != QQmlJSMetaMethod::Type::Signal) { + if (qmlMethod.methodType() != QQmlJSMetaMethodType::Signal) { functionsDeclarations.emplace_back(Utils::SmallString{qmlMethod.methodName()}, fullyQualifiedTypeName(qmlMethod.returnTypeName(), componentNameWithoutNamespace), diff --git a/tests/unit/tests/unittests/projectstorage/CMakeLists.txt b/tests/unit/tests/unittests/projectstorage/CMakeLists.txt index a2374ae265f..a877223dfe1 100644 --- a/tests/unit/tests/unittests/projectstorage/CMakeLists.txt +++ b/tests/unit/tests/unittests/projectstorage/CMakeLists.txt @@ -15,14 +15,14 @@ extend_qtc_test(unittest ) extend_qtc_test(unittest - CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0 AND Qt6_VERSION VERSION_LESS 6.6.0 + CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND Qt6_VERSION VERSION_GREATER_EQUAL 6.7.0 AND Qt6_VERSION VERSION_LESS 6.8.0 DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate SOURCES qmldocumentparser-test.cpp qmltypesparser-test.cpp ) extend_qtc_test(unittest - CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0 AND Qt6_VERSION VERSION_LESS 6.6.0 + CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND Qt6_VERSION VERSION_GREATER_EQUAL 6.7.0 AND Qt6_VERSION VERSION_LESS 6.8.0 SOURCES_PREFIX "${QmlDesignerDir}/designercore" DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate DEFINES QDS_BUILD_QMLPARSER