summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Motoyoshi Kalland <kim.kalland@nokia.com>2010-11-25 13:26:42 +0100
committerKim Motoyoshi Kalland <kim.kalland@nokia.com>2010-11-25 13:29:02 +0100
commitb11edfd1461f48ed1aa95f2b0718de2e3831856e (patch)
tree1fefc14b6aab2b70e8b7fbc8e0c0c7bf4a5abba6
parenta6a1b35babad4aff5bc27d085301e675588e9e18 (diff)
Fixed ShaderEffectItem examples after incorrect rebase.
-rw-r--r--examples/shadereffectitem/Effectoids/Box4PointBlur.qml1
-rw-r--r--examples/shadereffectitem/Effectoids/Colorize.qml2
-rw-r--r--examples/shadereffectitem/Effectoids/Directional4PointBlur.qml1
-rw-r--r--examples/shadereffectitem/Effectoids/DropShadow.qml1
4 files changed, 0 insertions, 5 deletions
diff --git a/examples/shadereffectitem/Effectoids/Box4PointBlur.qml b/examples/shadereffectitem/Effectoids/Box4PointBlur.qml
index 64cd727..2f5ac01 100644
--- a/examples/shadereffectitem/Effectoids/Box4PointBlur.qml
+++ b/examples/shadereffectitem/Effectoids/Box4PointBlur.qml
@@ -80,7 +80,6 @@ ShaderEffectItem
" gl_Position = qt_Matrix * qt_Vertex; \n" +
"}"
- property variant source;
property real xOffset: 0.5 / width
property real yOffset: 0.5 / height
property variant _normMargins: Qt.size(margins.width / (2 * margins.width + width), margins.height / (2 * margins.height + height))
diff --git a/examples/shadereffectitem/Effectoids/Colorize.qml b/examples/shadereffectitem/Effectoids/Colorize.qml
index dead5cf..3d2c994 100644
--- a/examples/shadereffectitem/Effectoids/Colorize.qml
+++ b/examples/shadereffectitem/Effectoids/Colorize.qml
@@ -65,8 +65,6 @@ ShaderEffectItem
" gl_Position = qt_Matrix * qt_Vertex; \n" +
"}"
- property variant source;
-
property color color;
property real intensity;
active: intensity > 0
diff --git a/examples/shadereffectitem/Effectoids/Directional4PointBlur.qml b/examples/shadereffectitem/Effectoids/Directional4PointBlur.qml
index 4478dec..4a745b4 100644
--- a/examples/shadereffectitem/Effectoids/Directional4PointBlur.qml
+++ b/examples/shadereffectitem/Effectoids/Directional4PointBlur.qml
@@ -78,7 +78,6 @@ ShaderEffectItem
"}"
- property variant source;
property real spread: 1;
property real xStep: 0 / width;
property real yStep: 1 / height;
diff --git a/examples/shadereffectitem/Effectoids/DropShadow.qml b/examples/shadereffectitem/Effectoids/DropShadow.qml
index f93bf15..8c45e88 100644
--- a/examples/shadereffectitem/Effectoids/DropShadow.qml
+++ b/examples/shadereffectitem/Effectoids/DropShadow.qml
@@ -84,7 +84,6 @@ ShaderEffectItem
" gl_Position = qt_Matrix * qt_Vertex; \n" +
"}"
- property variant source;
property real xOffset: 0.66 / width;
property real yOffset: 0.66 / height;
property real xDisplacement: 10 / width;