aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2020-11-17 14:44:34 +0200
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2020-11-17 15:49:13 +0000
commit12f7df6a85d3a63835436f1dd39cc6378ab6fd20 (patch)
treee37a5d56bdb90bbf95338ed0c000fb32d29f304a /share
parent7dad568d9fd6147f5e70701266fee96a0f0d0e78 (diff)
QmlPuppet: Remove effect preview support
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>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qml/qmlpuppet/mockfiles/EffectNodeView.qml65
-rw-r--r--share/qtcreator/qml/qmlpuppet/mockfiles/ModelNode3DImageView.qml14
-rw-r--r--share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc1
3 files changed, 0 insertions, 80 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/EffectNodeView.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/EffectNodeView.qml
deleted file mode 100644
index cb2e581021..0000000000
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/EffectNodeView.qml
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-import QtQuick3D 1.15
-import QtQuick3D.Effects 1.15
-
-View3D {
- id: root
- anchors.fill: parent
- environment: sceneEnv
-
- property Effect previewEffect
-
- SceneEnvironment {
- id: sceneEnv
- antialiasingMode: SceneEnvironment.MSAA
- antialiasingQuality: SceneEnvironment.High
- effects: previewEffect
- }
-
- Node {
- DirectionalLight {
- eulerRotation.x: -30
- eulerRotation.y: -30
- }
-
- PerspectiveCamera {
- z: 120
- clipFar: 1000
- clipNear: 1
- }
-
- Model {
- id: model
- source: "#Sphere"
- materials: [
- DefaultMaterial {
- diffuseColor: "#4aee45"
- }
- ]
- }
- }
-}
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/ModelNode3DImageView.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/ModelNode3DImageView.qml
index 4c73ce5fd0..ac5fff1e3e 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/ModelNode3DImageView.qml
+++ b/share/qtcreator/qml/qmlpuppet/mockfiles/ModelNode3DImageView.qml
@@ -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)
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc b/share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc
index e094303014..e0f8dcbb80 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc
@@ -45,7 +45,6 @@
<file>mockfiles/ModelNode3DImageView.qml</file>
<file>mockfiles/ModelNode2DImageView.qml</file>
<file>mockfiles/MaterialNodeView.qml</file>
- <file>mockfiles/EffectNodeView.qml</file>
<file>mockfiles/ModelNodeView.qml</file>
<file>mockfiles/NodeNodeView.qml</file>
<file>mockfiles/meshes/arrow.mesh</file>