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

Merge remote-tracking branch 'origin/8.0'

Browse Source 
resolved conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/designercore/exceptions/exception.cpp

Change-Id: I13a5248415fa1ae03e1c6d0972d9b3bb8c80a3b0
This commit is contained in:
Tim Jenssen
2022-09-22 10:32:40 +02:00
parent 645fce14e0 fec59c21df
commit 80e2eddd95
41 changed files with 302 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -630,7 +630,7 @@ void Edit3DView::createEdit3DActions()
m_particlesRestartAction->action()->setEnabled(particlemode);
if (m_seeker)
m_seeker->setEnabled(false);
QmlDesigner::DesignerSettings::setValue("particleMode", particlemode);
QmlDesignerPlugin::settings().insert("particleMode", particlemode);
setCurrentStateNode(rootModelNode());
resetPuppet();
};