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

QmlDesigner: Make active3dScene internal (not saveable)

Browse Source 
Task-number: QDS-2699
Change-Id: I7c8e8245c7f4631a7f3cac121ed9a88e3395f579
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Mahmoud Badri
2020-09-01 16:00:00 +03:00
parent c46ca844fc
commit 88e5a6200b
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
View File

@@ -112,7 +112,7 @@ void Edit3DView::updateActiveScene3D(const QVariantMap &sceneState)
if (sceneState.contains(sceneKey)) { if (sceneState.contains(sceneKey)) {
qint32 newActiveScene = sceneState[sceneKey].value<qint32>(); qint32 newActiveScene = sceneState[sceneKey].value<qint32>();
edit3DWidget()->canvas()->updateActiveScene(newActiveScene); edit3DWidget()->canvas()->updateActiveScene(newActiveScene);
rootModelNode().setAuxiliaryData("active3dScene", newActiveScene); rootModelNode().setAuxiliaryData("active3dScene@Internal", newActiveScene);
} }
if (sceneState.contains(selectKey)) if (sceneState.contains(selectKey))

4
src/plugins/qmldesigner/designercore/model/rewriterview.cpp
View File

@@ -547,7 +547,6 @@ QString RewriterView::auxiliaryDataAsQML() const
for (const auto &node : allModelNodes()) { for (const auto &node : allModelNodes()) {
QHash<PropertyName, QVariant> data = node.auxiliaryData(); QHash<PropertyName, QVariant> data = node.auxiliaryData();
if (!data.isEmpty()) { if (!data.isEmpty()) {
hasAuxData = true;
if (columnCount > 80) { if (columnCount > 80) {
str += "\n"; str += "\n";
columnCount = 0; columnCount = 0;
@@ -566,7 +565,6 @@ QString RewriterView::auxiliaryDataAsQML() const
keys.sort(); keys.sort();
for (const QString &key : keys) { for (const QString &key : keys) {
if (key.endsWith("@NodeInstance")) if (key.endsWith("@NodeInstance"))
continue; continue;
@@ -578,7 +576,7 @@ QString RewriterView::auxiliaryDataAsQML() const
if (!safeName.exactMatch(key)) if (!safeName.exactMatch(key))
continue; continue;
hasAuxData = true;
const QVariant value = data.value(key.toUtf8()); const QVariant value = data.value(key.toUtf8());
QString strValue = value.toString(); QString strValue = value.toString();