diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2020-09-01 16:00:00 +0300 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2020-09-01 13:55:29 +0000 |
| commit | 88e5a6200b6b44375bae5ac8aea1cd60f596f366 (patch) | |
| tree | b71e798db2d2c61fa0de6bfe79e577c5e617d012 | |
| parent | c46ca844fc877fc3613465222d882dfcbdc98fb5 (diff) | |
QmlDesigner: Make active3dScene internal (not saveable)
Task-number: QDS-2699
Change-Id: I7c8e8245c7f4631a7f3cac121ed9a88e3395f579
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/components/edit3d/edit3dview.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/rewriterview.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index 87117f6318..04b3a09061 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<qint32>(); 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 eb9c650746..537f94ca4d 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<PropertyName, QVariant> 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(); |