aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2022-08-22 14:13:25 +0200
committerUlf Hermann <ulf.hermann@qt.io>2022-08-24 15:04:08 +0200
commit57e9eacaf27b4ed79fc248ae0148bcea1ef36dc2 (patch)
tree5e415c1fcb32bee7c06d9bdd9b3590c5d41c595d /examples/quick
parent7be4dcfd2c2dd27627bfc6a319f348a52c390632 (diff)
Examples: Actually fix the shadereffects example
The paths need to be the same between CMake and qmake and you really should not use absolute qrc paths. Amends commit d270c51f812b5f0ffe6208b38c8ea0e898535e50 Amends commit e0ee63a06eeef2d6325a5cbf1a29bd11e5d7ac29 Change-Id: I9f6d3ac3fbf4483e0c0f2cad540f45c25192886e Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'examples/quick')
-rw-r--r--examples/quick/shadereffects/CMakeLists.txt2
-rw-r--r--examples/quick/shadereffects/shadereffects.qml14
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/quick/shadereffects/CMakeLists.txt b/examples/quick/shadereffects/CMakeLists.txt
index a755102b02..ddea51d918 100644
--- a/examples/quick/shadereffects/CMakeLists.txt
+++ b/examples/quick/shadereffects/CMakeLists.txt
@@ -46,7 +46,7 @@ qt6_add_shaders(shadereffectsexample "shaders"
PRECOMPILE
OPTIMIZED
PREFIX
- "/shadereffects"
+ "/qt/qml/shadereffects"
FILES
"content/shaders/genie.vert"
"content/shaders/blur.frag"
diff --git a/examples/quick/shadereffects/shadereffects.qml b/examples/quick/shadereffects/shadereffects.qml
index b384c91fb5..3176ed2b34 100644
--- a/examples/quick/shadereffects/shadereffects.qml
+++ b/examples/quick/shadereffects/shadereffects.qml
@@ -81,7 +81,7 @@ Rectangle {
property real time: 0
NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
//! [fragment]
- fragmentShader: "qrc:/shadereffects/content/shaders/wobble.frag.qsb"
+ fragmentShader: "content/shaders/wobble.frag.qsb"
//! [fragment]
Slider {
id: wobbleSlider
@@ -108,10 +108,10 @@ Rectangle {
height: theItem.height
property variant delta: Qt.size(1.0 / width, 0.0)
property variant source: theSource
- fragmentShader: "qrc:/shadereffects/content/shaders/blur.frag.qsb"
+ fragmentShader: "content/shaders/blur.frag.qsb"
}
}
- fragmentShader: "qrc:/shadereffects/content/shaders/blur.frag.qsb"
+ fragmentShader: "content/shaders/blur.frag.qsb"
}
}
property real angle: 0
@@ -119,7 +119,7 @@ Rectangle {
NumberAnimation on angle { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 6000 }
property variant delta: Qt.size(offset.x / width, offset.y / height)
property real darkness: shadowSlider.value
- fragmentShader: "qrc:/shadereffects/content/shaders/shadow.frag.qsb"
+ fragmentShader: "content/shaders/shadow.frag.qsb"
Slider {
id: shadowSlider
anchors.left: parent.left
@@ -135,14 +135,14 @@ Rectangle {
height: 160
property variant source: theSource
property variant delta: Qt.size(0.5 / width, 0.5 / height)
- fragmentShader: "qrc:/shadereffects/content/shaders/outline.frag.qsb"
+ fragmentShader: "content/shaders/outline.frag.qsb"
}
ShaderEffect {
width: 160
height: 160
property variant source: theSource
property color tint: root.sliderToColor(colorizeSlider.value)
- fragmentShader: "qrc:/shadereffects/content/shaders/colorize.frag.qsb"
+ fragmentShader: "content/shaders/colorize.frag.qsb"
Slider {
id: colorizeSlider
anchors.left: parent.left
@@ -179,7 +179,7 @@ Rectangle {
//! [properties]
//! [vertex]
mesh: Qt.size(10, 10)
- vertexShader: "qrc:/shadereffects/content/shaders/genie.vert.qsb"
+ vertexShader: "content/shaders/genie.vert.qsb"
//! [vertex]
Slider {
id: genieSlider