diff options
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/shaders/scenegraph/qsggeometry.cpp | 4 | ||||
-rw-r--r-- | src/imports/shaders/scenegraph/qsggeometry.h | 4 | ||||
-rw-r--r-- | src/imports/shaders/shadereffectitem.cpp | 4 | ||||
-rw-r--r-- | src/imports/shaders/shadereffectsource.cpp | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/shaders/scenegraph/qsggeometry.cpp b/src/imports/shaders/scenegraph/qsggeometry.cpp index 14ee4db..05c111a 100644 --- a/src/imports/shaders/scenegraph/qsggeometry.cpp +++ b/src/imports/shaders/scenegraph/qsggeometry.cpp @@ -1,10 +1,10 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt scene graph research project. +** This file is part of the QML Shaders plugin of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/imports/shaders/scenegraph/qsggeometry.h b/src/imports/shaders/scenegraph/qsggeometry.h index 0055392..b6663f8 100644 --- a/src/imports/shaders/scenegraph/qsggeometry.h +++ b/src/imports/shaders/scenegraph/qsggeometry.h @@ -1,10 +1,10 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt scene graph research project. +** This file is part of the QML Shaders plugin of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage 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 diff --git a/src/imports/shaders/shadereffectsource.cpp b/src/imports/shaders/shadereffectsource.cpp index 0a133bd..7ceb7c2 100644 --- a/src/imports/shaders/shadereffectsource.cpp +++ b/src/imports/shaders/shadereffectsource.cpp @@ -229,7 +229,7 @@ void ShaderEffectSource::setTextureSize(const QSize &size) /*! \property ShaderEffectSource::live - \brief the flag tells wheter source item content is changing between frames. + \brief the flag tells whether source item content is changing between frames. */ void ShaderEffectSource::setLive(bool s) @@ -245,7 +245,7 @@ void ShaderEffectSource::setLive(bool s) /*! \qmlproperty bool ShaderEffectSource::hideSource - This property holds the flag to define wheter the original source item is + This property holds the flag to define whether the original source item is hidden when the effect item is drawn. The default value is false. @@ -253,7 +253,7 @@ void ShaderEffectSource::setLive(bool s) /*! \property ShaderEffectSource::hideSource - \brief the flag tells wheter original source item content should be hidden. + \brief the flag tells whether original source item content should be hidden. */ void ShaderEffectSource::setHideSource(bool hide) |