Renamed ShaderEffectItem to ShaderEffect and some API changes.

The ShaderEffectItem was renamed to ShaderEffect to be consistent
with other QML element names. The GLSL uniform variable
qt_ModelViewProjectionMatrix was renamed to qt_Matrix which is
easier to type and remember. The GridMesh element was removed.
The mesh resolution is now specified simply with a QSize.
To make the transition easier, the old API will continue to work
for some time, but will output warnings if used. Eventually, I
will remove the old API completely.

Change-Id: Iec4f2aa624a2c76a7db6750c58f73dbcb316ab6a
Reviewed-on: http://codereview.qt.nokia.com/2270
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/declarative/items/qsgshadereffectsource.cpp b/src/declarative/items/qsgshadereffectsource.cpp
index 4803ca0a60..5114d8c042 100644
--- a/src/declarative/items/qsgshadereffectsource.cpp
+++ b/src/declarative/items/qsgshadereffectsource.cpp
@@ -380,7 +380,7 @@ void QSGShaderEffectTexture::grab()
 
     ShaderEffectSource can be used as:
     \list
-    \o a texture source in a \l ShaderEffectItem.
+    \o a texture source in a \l ShaderEffect.
        This allows you to apply custom shader effects to any QML element.
     \o a cache for a complex element.
        The complex element can be rendered once into the texture, which can
@@ -472,7 +472,7 @@ QSGShaderEffectSource::~QSGShaderEffectSource()
 
     This property defines the OpenGL wrap modes associated with the texture.
     Modifying this property makes most sense when the element is used as a
-    source texture of a \l ShaderEffectItem.
+    source texture of a \l ShaderEffect.
 
     \list
     \o ShaderEffectSource.ClampToEdge - GL_CLAMP_TO_EDGE both horizontally and vertically
@@ -581,7 +581,7 @@ void QSGShaderEffectSource::setTextureSize(const QSize &size)
 
     This property defines the internal OpenGL format of the texture.
     Modifying this property makes most sense when the element is used as a
-    source texture of a \l ShaderEffectItem. Depending on the OpenGL
+    source texture of a \l ShaderEffect. Depending on the OpenGL
     implementation, this property might allow you to save some texture memory.
 
     \list