diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2011-06-08 12:11:14 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2011-06-08 12:11:14 (GMT) |
| commit | 33db4e2533b3e4e07d37b651b65491195be403ab (patch) | |
| tree | 1461e8762d3cb5868d3480fd61c2fff69f89b37c /tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml | |
| parent | c6a8f35846df86a87591372d022e54a701591f5b (diff) | |
| parent | ea7576eecacaaf5e82f5ebaf847dc9690baa9fca (diff) | |
| download | Qt-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/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml')
| -rw-r--r-- | tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml | 4 |
1 files changed, 2 insertions, 2 deletions
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 |