From 88e5a6200b6b44375bae5ac8aea1cd60f596f366 Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Tue, 1 Sep 2020 16:00:00 +0300 Subject: QmlDesigner: Make active3dScene internal (not saveable) Task-number: QDS-2699 Change-Id: I7c8e8245c7f4631a7f3cac121ed9a88e3395f579 Reviewed-by: Miikka Heikkinen Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/components/edit3d/edit3dview.cpp | 2 +- src/plugins/qmldesigner/designercore/model/rewriterview.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index 87117f6318a..04b3a09061f 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp @@ -112,7 +112,7 @@ void Edit3DView::updateActiveScene3D(const QVariantMap &sceneState) if (sceneState.contains(sceneKey)) { qint32 newActiveScene = sceneState[sceneKey].value(); edit3DWidget()->canvas()->updateActiveScene(newActiveScene); - rootModelNode().setAuxiliaryData("active3dScene", newActiveScene); + rootModelNode().setAuxiliaryData("active3dScene@Internal", newActiveScene); } if (sceneState.contains(selectKey)) diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index eb9c6507469..537f94ca4da 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -547,7 +547,6 @@ QString RewriterView::auxiliaryDataAsQML() const for (const auto &node : allModelNodes()) { QHash data = node.auxiliaryData(); if (!data.isEmpty()) { - hasAuxData = true; if (columnCount > 80) { str += "\n"; columnCount = 0; @@ -566,7 +565,6 @@ QString RewriterView::auxiliaryDataAsQML() const keys.sort(); for (const QString &key : keys) { - if (key.endsWith("@NodeInstance")) continue; @@ -578,7 +576,7 @@ QString RewriterView::auxiliaryDataAsQML() const if (!safeName.exactMatch(key)) continue; - + hasAuxData = true; const QVariant value = data.value(key.toUtf8()); QString strValue = value.toString(); -- cgit v1.2.3