aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/shadereffects
diff options
context:
space:
mode:
Diffstat (limited to 'examples/quick/shadereffects')
-rw-r--r--examples/quick/shadereffects/doc/src/shadereffects.qdoc5
-rw-r--r--examples/quick/shadereffects/shadereffects.qml3
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/quick/shadereffects/doc/src/shadereffects.qdoc b/examples/quick/shadereffects/doc/src/shadereffects.qdoc
index fd819f2ec1..5d1547a1fe 100644
--- a/examples/quick/shadereffects/doc/src/shadereffects.qdoc
+++ b/examples/quick/shadereffects/doc/src/shadereffects.qdoc
@@ -34,9 +34,9 @@
This example demonstrates a couple of visual effects that you can perform
with shaders in QtQuick 2.0
- ShaderEffects typically operate on other elements, using a ShaderEffectSource
+ ShaderEffects typically operate on other types, using a ShaderEffectSource
\snippet quick/shadereffects/shadereffects.qml source
- In the above snippet, theItem is the id of a complex QML element in the file.
+ In the above snippet, theItem is the id of a complex QML object in the file.
ShaderEffects can use this ShaderEffectSource as a texture in their fragment shader.
\snippet quick/shadereffects/shadereffects.qml fragment
@@ -49,4 +49,3 @@
provides more vertices for you to manipulate, enabling many effects.
\snippet quick/shadereffects/shadereffects.qml vertex
*/
-
diff --git a/examples/quick/shadereffects/shadereffects.qml b/examples/quick/shadereffects/shadereffects.qml
index 77de356eac..a8f0469b44 100644
--- a/examples/quick/shadereffects/shadereffects.qml
+++ b/examples/quick/shadereffects/shadereffects.qml
@@ -40,6 +40,7 @@
****************************************************************************/
import QtQuick 2.0
+import QtQml.Models 2.1
import "content"
Rectangle {
@@ -85,7 +86,7 @@ Rectangle {
height: 140
clip: true
snapMode: ListView.SnapOneItem
- model: VisualItemModel {
+ model: ObjectModel {
Text {
width: 160
height: 140