diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 14:59:56 +0100 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 15:02:08 +0100 |
| commit | 47c45bb1e487b3823281683c1110d9269f144582 (patch) | |
| tree | 4c687d46d9aa7d90f064a25e6c7f0241ae28e16d /tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml | |
| parent | 677be9a27770ff48dd771ec4fc1c66139aac4aa8 (diff) | |
| parent | 7d94fa8e074ba816751c60bd0ad3c63b3c0b0a27 (diff) | |
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative into newdocs
Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137
Diffstat (limited to 'tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml')
| -rw-r--r-- | tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml index a6fcc260cd..45f20dd5a4 100644 --- a/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml +++ b/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml @@ -69,7 +69,7 @@ Rectangle { anchors.margins: 10 width: 200 height: 100 - culling: model.bar + cullMode: model.bar property variant frontSource: front property variant backSource: back fragmentShader: " |