aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickshadereffect.cpp
diff options
context:
space:
mode:
authorJuha Turunen <turunen@iki.fi>2015-11-29 02:45:19 -0800
committerJuha Turunen <juha.turunen@theqtcompany.com>2015-12-08 07:17:14 +0000
commitd9763f2565445ada2d11bde3c1f46b5217b17dab (patch)
tree44e7e550611e372bb89abe6005daaffa04f51c80 /src/quick/items/qquickshadereffect.cpp
parenta2d154022ddd585fd4ed4cd9e1d1a00ddee3bf5c (diff)
Fix a mix-up in ShaderEffect QML type documentation
The description of the default vertex shader was documented under the fragmentShader property and vice versa. Change-Id: I2d609d7621f8478671ff96d787b1f4464ccb62f8 Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/quick/items/qquickshadereffect.cpp')
-rw-r--r--src/quick/items/qquickshadereffect.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp
index 349207f145..3e062df5d4 100644
--- a/src/quick/items/qquickshadereffect.cpp
+++ b/src/quick/items/qquickshadereffect.cpp
@@ -710,8 +710,9 @@ QQuickShaderEffect::~QQuickShaderEffect()
\qmlproperty string QtQuick::ShaderEffect::fragmentShader
This property holds the fragment shader's GLSL source code.
- The default shader passes the texture coordinate along to the fragment
- shader as "varying highp vec2 qt_TexCoord0".
+ The default shader expects the texture coordinate to be passed from the
+ vertex shader as "varying highp vec2 qt_TexCoord0", and it samples from a
+ sampler2D named "source".
*/
void QQuickShaderEffect::setFragmentShader(const QByteArray &code)
@@ -737,9 +738,8 @@ void QQuickShaderEffect::setFragmentShader(const QByteArray &code)
\qmlproperty string QtQuick::ShaderEffect::vertexShader
This property holds the vertex shader's GLSL source code.
- The default shader expects the texture coordinate to be passed from the
- vertex shader as "varying highp vec2 qt_TexCoord0", and it samples from a
- sampler2D named "source".
+ The default shader passes the texture coordinate along to the fragment
+ shader as "varying highp vec2 qt_TexCoord0".
*/
void QQuickShaderEffect::setVertexShader(const QByteArray &code)