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

QmlPuppet: Remove effect preview support

Browse Source 
The issue in QtQuick3D blocking effect previews (QTBUG-86616) is not
going to be fixed in Qt 5 anymore, and Effect was moved to QtQuick3D
from QtQuick3D.Effects in Qt 6, so this can't be written in Qt 5 and
Qt 6 compatible manner anyway. Removed the support for now as it needs
to be implemented differently if we want to enable effect previews in
the future.

Change-Id: Ic786608572c3350e22dab75366cb93586c29459a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2020-11-17 14:44:34 +02:00
parent 7dad568d9f
commit 12f7df6a85
3 changed files with 0 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
share/qtcreator/qml/qmlpuppet/mockfiles/ModelNode3DImageView.qml
View File

@@ -25,7 +25,6 @@
import QtQuick 2.15
import QtQuick3D 1.15
import QtQuick3D.Effects 1.15
Item {
id: root
@@ -39,7 +38,6 @@ Item {
property var previewObject
property var materialViewComponent
property var effectViewComponent
property var modelViewComponent
property var nodeViewComponent
@@ -59,8 +57,6 @@ Item {
if (obj instanceof Material)
createViewForMaterial(obj);
else if (obj instanceof Effect)
createViewForEffect(obj);
else if (obj instanceof Model)
createViewForModel(obj);
else if (obj instanceof Node)
@@ -79,16 +75,6 @@ Item {
view = materialViewComponent.createObject(viewRect, {"previewMaterial": material});
}
function createViewForEffect(effect)
{
if (!effectViewComponent)
effectViewComponent = Qt.createComponent("EffectNodeView.qml");
// Always recreate the view to ensure effect is up to date
if (effectViewComponent.status === Component.Ready)
view = effectViewComponent.createObject(viewRect, {"previewEffect": effect});
}
function createViewForModel(model)
{
if (!modelViewComponent)