diff options
| author | Marko Niemelä <marko.a.niemela@nokia.com> | 2011-05-26 07:11:17 (GMT) |
|---|---|---|
| committer | Marko Niemelä <marko.a.niemela@nokia.com> | 2011-05-26 07:12:56 (GMT) |
| commit | e35d0af6ef3016b27bfd6dca1cf5c8f8a153fc04 (patch) | |
| tree | 24924adf8cd36ad7bf76f04e0462e6cb8507a9b6 /src/imports/shaders/shadereffectitem.cpp | |
| parent | c9eb2ffd1ed940133392831747605bf735d92086 (diff) | |
| download | Qt-e35d0af6ef3016b27bfd6dca1cf5c8f8a153fc04.zip Qt-e35d0af6ef3016b27bfd6dca1cf5c8f8a153fc04.tar.gz Qt-e35d0af6ef3016b27bfd6dca1cf5c8f8a153fc04.tar.bz2 | |
Fixed CI-errors caused by qmlshadersplugin addition.
These are fixes for CI-issues caused by db20b6c03b6a93ab3e483cd85d5d0a923c3d3430
Reviewed-by: Kim Gronholm
Diffstat (limited to 'src/imports/shaders/shadereffectitem.cpp')
| -rw-r--r-- | src/imports/shaders/shadereffectitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/shaders/shadereffectitem.cpp b/src/imports/shaders/shadereffectitem.cpp index a32168e..5bb906c 100644 --- a/src/imports/shaders/shadereffectitem.cpp +++ b/src/imports/shaders/shadereffectitem.cpp @@ -302,7 +302,7 @@ void ShaderEffectItem::setVertexShader(const QString &code) /*! \qmlproperty bool ShaderEffectItem::blending - This property defines wheter item is drawn using blending. + This property defines whether item is drawn using blending. If true, the RGBA pixel output from the fragment shader is blended with the pixel RGBA-values already in the framebuffer. @@ -565,7 +565,7 @@ void ShaderEffectItem::bindGeometry() continue; Q_ASSERT_X(j < m_geometry.attributeCount(), "ShaderEffectItem::bindGeometry()", "Geometry lacks attribute required by material"); const QSGGeometry::Attribute &a = m_geometry.attributes()[j]; - Q_ASSERT_X(j == a.position, "ShaderEffectItem::bindGeometry()", "Geometry does not have continous attribute positions"); + Q_ASSERT_X(j == a.position, "ShaderEffectItem::bindGeometry()", "Geometry does not have continuous attribute positions"); #if defined(QT_OPENGL_ES_2) GLboolean normalize = a.type != GL_FLOAT; #else |