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

QmlDesigner: Adapt to QtQml.QtObject

Browse Source 
* Adding QtObjectPane for QtQml support
* Allowing also QtQml.QtObject to determine major version

Change-Id: If82ea1c52cb4b78415d0f422e22b5423903b5abb
Reviewed-by: Christian Kamm <mail@ckamm.de>
This commit is contained in:
Thomas Hartmann
2020-06-10 14:45:56 +02:00
parent d0960a33ac
commit a5ef3260fa
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQml/QtObjectPane.qml Normal file
View File

@@ -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 {
}

6
src/plugins/qmldesigner/designercore/model/abstractview.cpp
View File

@@ -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();
}
}