summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorMarko Niemelä <marko.a.niemela@nokia.com>2011-06-13 12:57:49 (GMT)
committerMarko Niemelä <marko.a.niemela@nokia.com>2011-06-13 12:57:49 (GMT)
commit3199ee59ad931b88a26657fc5c66d94c4fff606f (patch)
tree5bd78f006f812693b6512fd447f971c8fddc54ef /doc/src
parent3359984cd1f8e568feb42969830b3fb6a13f5718 (diff)
downloadQt-3199ee59ad931b88a26657fc5c66d94c4fff606f.zip
Qt-3199ee59ad931b88a26657fc5c66d94c4fff606f.tar.gz
Qt-3199ee59ad931b88a26657fc5c66d94c4fff606f.tar.bz2
Qmlshadersplugin examples added.
Example application for OpenGL shading language and QML. Added also a link from qml examples main documents labs section. Reviewed-by: Kim Gronholm
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/examples.qdoc23
-rw-r--r--doc/src/examples/qml-examples.qdoc10
-rw-r--r--doc/src/images/qml-shadereffects-example.pngbin0 -> 271264 bytes
3 files changed, 22 insertions, 11 deletions
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index 0e325e2..1003b22 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -33,7 +33,7 @@
Qt includes a set of examples and demos that show how to use various aspects
-of QML. The examples are small demonstrations of particular QML components,
+of QML. The examples are small demonstrations of particular QML components,
while the demos contain more complete and functional applications.
To run the examples and demos, open them in Qt Creator or use the included
@@ -60,43 +60,43 @@ can be used to produce sophisticated interfaces and applications:
\table
\row
-\o
+\o
\l{demos/declarative/calculator}{Calculator}
\image qml-calculator-example-small.png
-\o
+\o
\l{demos/declarative/flickr}{Flickr Mobile}
\image qml-flickr-demo-small.png
-\o
+\o
\l{demos/declarative/minehunt}{Minehunt}
\image qml-minehunt-demo-small.png
\row
-\o
+\o
\l{demos/declarative/photoviewer}{Photo Viewer}
\image qml-photoviewer-demo-small.png
-\o
+\o
\l{demos/declarative/rssnews}{RSS News Reader}
\image qml-rssnews-demo-small.png
-\o
+\o
\l{demos/declarative/samegame}{Same Game}
\image qml-samegame-demo-small.png
\row
-\o
+\o
\l{demos/declarative/snake}{Snake}
\image qml-snake-demo-small.png
-\o
+\o
\l{demos/declarative/twitter}{Twitter}
\image qml-twitter-demo-small.png
-\o
+\o
\l{demos/declarative/webbrowser}{Web Browser}
\image qml-webbrowser-demo-small.png
@@ -109,7 +109,7 @@ The demos can be found in Qt's \c demos/declarative directory.
The QML examples are small, simple applications that show how to use a particular
QML component or feature. If you are new
-to QML, you may also find the \l{QML Tutorial}{Hello World} and
+to QML, you may also find the \l{QML Tutorial}{Hello World} and
\l {QML Advanced Tutorial}{Same Game} tutorials useful.
The examples can be found in Qt's \c examples/declarative directory.
@@ -234,6 +234,7 @@ The examples can be found in Qt's \c examples/declarative directory.
\list
\o \l{src/imports/folderlistmodel}{Folder List Model} - a C++ model plugin
+\o \l{declarative/shadereffects}{Shader Effects}
\endlist
*/
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 00eeb43..a910266 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -714,3 +714,13 @@
\image qml-xmlhttprequest-example.png
*/
+
+/*!
+ \title Labs: Shader Effects
+ \example declarative/shadereffects
+
+ This example shows how to create visual effects by using OpenGL shading language together with QML using \l ShaderEffectItem and \l ShaderEffectSource APIs.
+
+ \image qml-shadereffects-example.png
+*/
+
diff --git a/doc/src/images/qml-shadereffects-example.png b/doc/src/images/qml-shadereffects-example.png
new file mode 100644
index 0000000..9649fe1
--- /dev/null
+++ b/doc/src/images/qml-shadereffects-example.png
Binary files differ