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

Integrate Edit3D view into Creator

Browse Source 
Edit3D view is now a tab alongside Form Editor.
Buttons were moved to a Creator side task bar on Edit 3D view.

Change-Id: Ia06107e4f855ba512ffea3e628a61558894e800e
Fixes: QDS-1570
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2020-02-11 11:33:25 +02:00
parent 7eda08f600
commit 4908055937
93 changed files with 2037 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
View File

@@ -627,16 +627,18 @@ QList<QQuickItem *> ServerNodeInstance::allItemsRecursive() const
QString ServerNodeInstance::id() const
{
return m_nodeInstance->id();
if (isValid())
return m_nodeInstance->id();
return {};
}
qint32 ServerNodeInstance::instanceId() const
{
if (isValid()) {
if (isValid())
return m_nodeInstance->instanceId();
} else {
return -1;
}
return -1;
}
QList<ServerNodeInstance> ServerNodeInstance::stateInstances() const