Move the composition example in the docs.

Change-Id: I63e906e78de75466b9c9bf99d553691c8335f9b2
Reviewed-on: http://codereview.qt.nokia.com/903
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kevin Wright <kevin.wright@nokia.com>

diff --git a/doc/src/demos/composition.qdoc b/doc/src/examples/composition.qdoc
similarity index 97%
rename from doc/src/demos/composition.qdoc
rename to doc/src/examples/composition.qdoc
index c2eadc7..53ca3db 100644 (file)
--- a/doc/src/demos/composition.qdoc
+++ b/doc/src/examples/composition.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example demos/composition
+    \example painting/composition
     \title Composition Modes
 
     This demo shows some of the more advanced composition modes supported by Qt.

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 82e5524..8b556ca 100644 (file)
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -1320,8 +1320,8 @@ void QPainterPrivate::updateState(QPainterState *newState)
     \o
     \bold {Composition Modes Demo}
 
-    The \l {demos/composition}{Composition Modes} demo, available in
-    Qt's demo directory, allows you to experiment with the various
+    The \l {painting/composition}{Composition Modes} example, available in
+    Qt's examples directory, allows you to experiment with the various
     composition modes and see the results immediately.
 
     \endtable

diff --git a/tests/auto/guiapplauncher/demos.txt b/tests/auto/guiapplauncher/demos.txt
index d8da552..d2b2e08 100644 (file)
--- a/tests/auto/guiapplauncher/demos.txt
+++ b/tests/auto/guiapplauncher/demos.txt
@@ -1,4 +1,3 @@
-"Composition Demo", "demos/composition", "composition", 0, -1
 "Deform Demo", "demos/deform", "deform", 0, -1
 "Embeddeddialogs Demo", "demos/embeddeddialogs", "embeddeddialogs", 0, -1
 "Gradients Demo", "demos/gradients", "gradients", 0, -1

diff --git a/tests/auto/guiapplauncher/examples.txt b/tests/auto/guiapplauncher/examples.txt
index 455cb46..2526571 100644 (file)
--- a/tests/auto/guiapplauncher/examples.txt
+++ b/tests/auto/guiapplauncher/examples.txt
@@ -62,8 +62,9 @@
 "opengl/overpainting Example", "examples/opengl/overpainting", "overpainting", 10, -1
 "opengl/samplebuffers Example", "examples/opengl/samplebuffers", "samplebuffers", 10, -1
 "opengl/textures Example", "examples/opengl/textures", "textures", 10, -1
-"Affine Transformations Example", "examples/painting/affine", "affine", 0, -1
+"painting/affine Example", "examples/painting/affine", "affine", 0, -1
 "painting/basicdrawing Example", "examples/painting/basicdrawing", "basicdrawing", 10, -1
+"painting/composition Example", "examples/painting/composition", "composition", 0, -1
 "painting/concentriccircles Example", "examples/painting/concentriccircles", "concentriccircles", 0, -1
 "painting/fontsampler Example", "examples/painting/fontsampler", "fontsampler", 0, -1
 "painting/imagecomposition Example", "examples/painting/imagecomposition", "imagecomposition", 10, -1