From a5ef3260fa5862a74df1ad6b1ca8159fc6075eb3 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 10 Jun 2020 14:45:56 +0200 Subject: [PATCH] QmlDesigner: Adapt to QtQml.QtObject * Adding QtObjectPane for QtQml support * Allowing also QtQml.QtObject to determine major version Change-Id: If82ea1c52cb4b78415d0f422e22b5423903b5abb Reviewed-by: Christian Kamm --- .../QtQml/QtObjectPane.qml | 31 +++++++++++++++++++ .../designercore/model/abstractview.cpp | 6 ++-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQml/QtObjectPane.qml diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQml/QtObjectPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQml/QtObjectPane.qml new file mode 100644 index 00000000000..5dd1473c5d5 --- /dev/null +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQml/QtObjectPane.qml @@ -0,0 +1,31 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +****************************************************************************/ + +import QtQuick 2.0 +import "../QtQuick" as Original + +Original.QtObjectPane { + +} diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp index 652c23c6e6f..03ac27a5b0c 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp @@ -833,8 +833,10 @@ static int getMajorVersionFromImport(const Model *model) static int getMajorVersionFromNode(const ModelNode &modelNode) { if (modelNode.metaInfo().isValid()) { - foreach (const NodeMetaInfo &info, modelNode.metaInfo().classHierarchy()) { - if (info.typeName() == "QtQuick.QtObject" || info.typeName() == "QtQuick.Item") + for (const NodeMetaInfo &info : modelNode.metaInfo().classHierarchy()) { + if (info.typeName() == "QtQml.QtObject" + || info.typeName() == "QtQuick.QtObject" + || info.typeName() == "QtQuick.Item") return info.majorVersion(); } }