From 42ad06ee32429dccb4c4bf281292a8028751963e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 5 May 2017 13:45:11 +0200 Subject: QmlDesigner: Use proper meta info for Item The QML minor version does not always match the QtQuick.Item minor version. The wrong version leads to warnings/error messages later. Change-Id: I5d38c17da079d8309db4fd4044eb0be4e9093dae Reviewed-by: Tim Jenssen Reviewed-by: Eike Ziller --- .../qmldesigner/components/componentcore/modelnodeoperations.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index c26f970441..d80b1f729d 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -840,8 +840,13 @@ void addItemToStackedContainer(const SelectionContext &selectionContext) RewriterTransaction transaction = view->beginRewriterTransaction(QByteArrayLiteral("DesignerActionManager:addItemToStackedContainer")); + NodeMetaInfo itemMetaInfo = view->model()->metaInfo("QtQuick.Item", -1, -1); + QTC_ASSERT(itemMetaInfo.isValid(), return); + QTC_ASSERT(itemMetaInfo.majorVersion() == 2, return); + QmlDesigner::ModelNode itemNode = - view->createModelNode("QtQuick.Item", view->majorQtQuickVersion(), view->minorQtQuickVersion()); + view->createModelNode("QtQuick.Item", itemMetaInfo.majorVersion(), itemMetaInfo.minorVersion()); + container.defaultNodeListProperty().reparentHere(itemNode); if (potentialTabBar.isValid()) {// The stacked container is hooked up to a TabBar -- cgit v1.2.1