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

Merge remote-tracking branch 'origin/8.0' into 9.0

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp

Change-Id: I38f196e8f42cf11f7b613e7a723745600e35c5e9
This commit is contained in:
Eike Ziller
2022-09-27 10:03:37 +02:00
parent 21c5d3499b 4da6686705
commit 7eaa36e6e5
61 changed files with 932 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dmaterialnodeinstance.cpp
View File

@@ -15,12 +15,13 @@ Quick3DMaterialNodeInstance::~Quick3DMaterialNodeInstance()
{
}
void Quick3DMaterialNodeInstance::initialize(const ObjectNodeInstance::Pointer &objectNodeInstance,
InstanceContainer::NodeFlags flags)
void Quick3DMaterialNodeInstance::invokeDummyViewCreate() const
{
m_dummyRootViewCreateFunction = "createViewForMaterial";
Quick3DRenderableNodeInstance::initialize(objectNodeInstance, flags);
QMetaObject::invokeMethod(m_dummyRootView, "createViewForMaterial",
Q_ARG(QVariant, QVariant::fromValue(object())),
Q_ARG(QVariant, ""),
Q_ARG(QVariant, ""),
Q_ARG(QVariant, ""));
}
Quick3DMaterialNodeInstance::Pointer Quick3DMaterialNodeInstance::create(QObject *object)