diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-11 23:26:32 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-11 23:26:32 +0200 |
| commit | 480e2550d7c3be5aecc1b6acdc32fb7cd80fe801 (patch) | |
| tree | a8d0d2321d4f17a319c02de14b1bdf5f0b08004f /src | |
| parent | 1e2b1fef23181da20883a2979c2bf52aa5ad132b (diff) | |
| parent | 3ecb005bc62826db13e1c82e799997e0b4181e75 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If1557686dd6626724246f700e78f77f4ed7d6d0c
Diffstat (limited to 'src')
| -rw-r--r-- | src/effects/FastBlur.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/effects/FastBlur.qml b/src/effects/FastBlur.qml index 5950ac7..659958c 100644 --- a/src/effects/FastBlur.qml +++ b/src/effects/FastBlur.qml @@ -172,6 +172,7 @@ Item { smooth: rootItem.radius > 0 } + /*! \internal */ property string __internalBlurVertexShader: " attribute highp vec4 qt_Vertex; attribute highp vec2 qt_MultiTexCoord0; @@ -192,6 +193,7 @@ Item { } " + /*! \internal */ property string __internalBlurFragmentShader: " uniform lowp sampler2D source; uniform lowp float qt_Opacity; |