diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-05-05 13:45:11 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-05-05 12:09:31 +0000 |
| commit | 42ad06ee32429dccb4c4bf281292a8028751963e (patch) | |
| tree | cc4d4eafa26aac46e11859384204ead0e22c3b6c | |
| parent | ec0ff0cf7cd7e4fa73cb1b1551b245895886d2a8 (diff) | |
| download | qt-creator-42ad06ee32429dccb4c4bf281292a8028751963e.tar.gz | |
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 <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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 |