summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorToby Tomkins <toby.tomkins@nokia.com>2011-06-08 12:11:14 (GMT)
committerToby Tomkins <toby.tomkins@nokia.com>2011-06-08 12:11:14 (GMT)
commit33db4e2533b3e4e07d37b651b65491195be403ab (patch)
tree1461e8762d3cb5868d3480fd61c2fff69f89b37c /tests
parentc6a8f35846df86a87591372d022e54a701591f5b (diff)
parentea7576eecacaaf5e82f5ebaf847dc9690baa9fca (diff)
downloadQt-33db4e2533b3e4e07d37b651b65491195be403ab.zip
Qt-33db4e2533b3e4e07d37b651b65491195be403ab.tar.gz
Qt-33db4e2533b3e4e07d37b651b65491195be403ab.tar.bz2
Merge remote branch 'upstream/4.7' into qt-4.8-from-4.7
Diffstat (limited to 'tests')
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml2
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml4
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml2
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml2
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml
index 3b94389..ec372ca 100644
--- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml
@@ -70,7 +70,7 @@ Rectangle {
uniform lowp sampler2D source;
varying highp vec2 qt_TexCoord0;
void main() {
- vec2 tex = qt_TexCoord0 * 4.0;
+ highp vec2 tex = qt_TexCoord0 * 4.0;
gl_FragColor = texture2D(source, tex);
}
"
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml
index a7530dc..4edb065 100644
--- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml
@@ -67,7 +67,7 @@ Rectangle {
{
qt_TexCoord0 = qt_MultiTexCoord0;
gl_Position = qt_ModelViewProjectionMatrix * qt_Vertex;
- };
+ }
"
property string dummyVertexShader: "
@@ -79,7 +79,7 @@ Rectangle {
{
qt_TexCoord0 = qt_MultiTexCoord0;
gl_Position = qt_Vertex * vec4(0.0, 0.0, 0.0, 0.0001);
- };
+ }
"
vertexShader: defaultVertexShader
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml
index 726b237..b7d6db4 100644
--- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml
@@ -69,7 +69,7 @@ Rectangle {
uniform lowp sampler2D source;
varying highp vec2 qt_TexCoord0;
void main() {
- vec2 tex = qt_TexCoord0 * 4.0;
+ highp vec2 tex = qt_TexCoord0 * 4.0;
gl_FragColor = texture2D(source, tex);
}
"
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml
index 514e150..e09673c 100644
--- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml
@@ -69,7 +69,7 @@ Rectangle {
uniform lowp sampler2D source;
varying highp vec2 qt_TexCoord0;
void main() {
- vec2 tex = qt_TexCoord0 * 4.0;
+ highp vec2 tex = qt_TexCoord0 * 4.0;
gl_FragColor = texture2D(source, tex);
}
"