diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-05 15:31:08 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 10:11:04 +0200 |
| commit | af44559780765c7121a49c2e0764cf24e740312d (patch) | |
| tree | a4f2f50ddfe969f33a4d4accd392523c6809fd5a /tests/auto/quick/qquickitemlayer | |
| parent | 8784a4a46ea1357bde546c9a1c88bd060e863f30 (diff) | |
| parent | b30d7c9ee8fbc3a395c74b618f2ab176ae1e7f7e (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/qml/debugger/qv8debugservice.cpp
src/qml/qml/v8/qv8engine.cpp
tests/auto/quick/qquickitem/qquickitem.pro
Change-Id: Ic4a1dcdd8b8a84155d2f2abefdf1da5c3a56af31
Diffstat (limited to 'tests/auto/quick/qquickitemlayer')
| -rw-r--r-- | tests/auto/quick/qquickitemlayer/data/SourceRect.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickitemlayer/data/SourceRect.qml b/tests/auto/quick/qquickitemlayer/data/SourceRect.qml index a161760028..76ad61bd14 100644 --- a/tests/auto/quick/qquickitemlayer/data/SourceRect.qml +++ b/tests/auto/quick/qquickitemlayer/data/SourceRect.qml @@ -22,8 +22,8 @@ Item uniform lowp float qt_Opacity; varying highp vec2 qt_TexCoord0; void main() { - vec4 c = texture2D(source, qt_TexCoord0); - if (c.a == 0.) + mediump vec4 c = texture2D(source, qt_TexCoord0); + if (c.a == 0.0) c = vec4(0, 0, 1, 1); gl_FragColor = c * qt_Opacity; } |