feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Use Qt 6.7 for project storage

Browse Source 
Change-Id: Ibf0df9a05dda2c3bbd2a55935e9471ebf40dcf64
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2024-07-10 16:17:31 +02:00
parent 7af9acc445
commit 67c7beeffe
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/CMakeLists.txt
View File

@@ -126,7 +126,7 @@ extend_qtc_library(QmlDesignerCore
) )
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 PUBLIC_DEFINES QDS_BUILD_QMLPARSER
) )
extend_qtc_library(QmlDesignerCore extend_qtc_library(QmlDesignerCore

2
src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp
View File

@@ -288,7 +288,7 @@ createFunctionAndSignals(const QMultiHash<QString, QQmlJSMetaMethod> &qmlMethods
if (qmlMethod.isJavaScriptFunction()) if (qmlMethod.isJavaScriptFunction())
continue; continue;
if (qmlMethod.methodType() != QQmlJSMetaMethod::Type::Signal) { if (qmlMethod.methodType() != QQmlJSMetaMethodType::Signal) {
functionsDeclarations.emplace_back(Utils::SmallString{qmlMethod.methodName()}, functionsDeclarations.emplace_back(Utils::SmallString{qmlMethod.methodName()},
fullyQualifiedTypeName(qmlMethod.returnTypeName(), fullyQualifiedTypeName(qmlMethod.returnTypeName(),
componentNameWithoutNamespace), componentNameWithoutNamespace),

4
tests/unit/tests/unittests/projectstorage/CMakeLists.txt
View File

@@ -15,14 +15,14 @@ extend_qtc_test(unittest
) )
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 DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate
SOURCES SOURCES
qmldocumentparser-test.cpp qmldocumentparser-test.cpp
qmltypesparser-test.cpp qmltypesparser-test.cpp
) )
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
SOURCES_PREFIX "${QmlDesignerDir}/designercore" SOURCES_PREFIX "${QmlDesignerDir}/designercore"
DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate
DEFINES QDS_BUILD_QMLPARSER DEFINES QDS_BUILD_QMLPARSER