From f22ae0a726f937ae0972fc9c77fa362f02bd8cd5 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 29 Apr 2021 22:42:55 +0200 Subject: [PATCH] QmlDesigner: Support QtQuick 6.0 import Change-Id: Ie6e752d58fb5a0c7989ab5c47166c6d08937d8d5 Reviewed-by: Thomas Hartmann --- .../designercore/model/texttomodelmerger.cpp | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index a751bf5b1f0..21b47c312bf 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -78,10 +78,24 @@ bool isSupportedAttachedProperties(const QString &propertyName) QStringList supportedVersionsList() { - static const QStringList list = { - "2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9", - "2.10", "2.11", "2.12", "2.13", "2.14", "2.15" - }; + static const QStringList list = {"2.0", + "2.1", + "2.2", + "2.3", + "2.4", + "2.5", + "2.6", + "2.7", + "2.8", + "2.9", + "2.10", + "2.11", + "2.12", + "2.13", + "2.14", + "2.15", + "6.0", + "6.1"}; return list; }