diff options
author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-11 09:27:02 +0100 |
---|---|---|
committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-11 09:27:02 +0100 |
commit | 720431716a8af66d1be73a1c9462ef12af831c90 (patch) | |
tree | c54a9e61a4507247de404046338d38ca2828540e /tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml | |
parent | 6766fcf138b7cec101cd0c7d3d9a7ac42f1bfe3a (diff) | |
parent | 9aac83d22ddbebc22fb1360d710263d349c2fdda (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I09ce9ad6e50bdb6034717d45ad73b4d21474a6e2
Diffstat (limited to 'tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml')
-rw-r--r-- | tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml index 3641ca50..bcb1979e 100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml @@ -101,7 +101,7 @@ Rectangle { Text { id: label anchors.centerIn: parent - text: effect.vertexShader == effect.defaultVertexShader ? "Effect (display shoud be green)" : "Effect (display shoud be red)" + text: effect.vertexShader == effect.defaultVertexShader ? "Effect (display should be green)" : "Effect (display should be red)" color: "white" font.bold: true } |