diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-27 10:58:56 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-27 10:58:56 +0100 |
| commit | 9df70b0304fa44d2f1b1504d7e58d718eab4343a (patch) | |
| tree | 95a7b207a39c2b44bd4e80bcc1ea3d36bedd9a99 /src/quick/items/shaders/shadereffectfallback.frag | |
| parent | 648d4ae6a3591e916f175e32c12a2ea4f8edb6a9 (diff) | |
| parent | 900e3d4ad5f2bc4994ddf164c15c641f85630b81 (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: I10d4f9e993d23750a6e8ddc1291b79e47fc83c64
Diffstat (limited to 'src/quick/items/shaders/shadereffectfallback.frag')
| -rw-r--r-- | src/quick/items/shaders/shadereffectfallback.frag | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/items/shaders/shadereffectfallback.frag b/src/quick/items/shaders/shadereffectfallback.frag new file mode 100644 index 0000000000..d279e54083 --- /dev/null +++ b/src/quick/items/shaders/shadereffectfallback.frag @@ -0,0 +1,4 @@ +void main() +{ + gl_FragColor = vec4(1., 0., 1., 1.); +}
\ No newline at end of file |