Move the books example in the docs.

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

diff --git a/doc/src/demos/books.qdoc b/doc/src/examples/books.qdoc
similarity index 98%
rename from doc/src/demos/books.qdoc
rename to doc/src/examples/books.qdoc
index 7eccd5b..64a4613 100644 (file)
--- a/doc/src/demos/books.qdoc
+++ b/doc/src/examples/books.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example demos/books
+    \example sql/books
     \title Books Demonstration
 
     The Books demonstration shows how Qt's SQL classes can be used with the model/view

diff --git a/doc/src/sql-programming/sql-programming.qdoc b/doc/src/sql-programming/sql-programming.qdoc
index 68b1a2f..55f9748 100644 (file)
--- a/doc/src/sql-programming/sql-programming.qdoc
+++ b/doc/src/sql-programming/sql-programming.qdoc
@@ -603,7 +603,7 @@
 
     \image qdatawidgetmapper-simple.png
 
-    The \l{demos/books}{Books} demonstration shows how information can
+    The \l{sql/books}{Books} example shows how information can
     be presented for easy access by using QDataWidgetMapper and a set of
     simple input widgets.
 */

diff --git a/tests/auto/guiapplauncher/demos.txt b/tests/auto/guiapplauncher/demos.txt
index 8853c26..97aef2c 100644 (file)
--- a/tests/auto/guiapplauncher/demos.txt
+++ b/tests/auto/guiapplauncher/demos.txt
@@ -1,4 +1,3 @@
-"Books Demo", "demos/books", "books", 0, -1
 "Chip Demo", "demos/chip", "chip", 0, -1
 "Composition Demo", "demos/composition", "composition", 0, -1
 "Deform Demo", "demos/deform", "deform", 0, -1

diff --git a/tests/auto/guiapplauncher/examples.txt b/tests/auto/guiapplauncher/examples.txt
index fac703a..53d2c6b 100644 (file)
--- a/tests/auto/guiapplauncher/examples.txt
+++ b/tests/auto/guiapplauncher/examples.txt
@@ -73,6 +73,7 @@
 "richtext/orderform Example", "examples/richtext/orderform", "orderform", 10, -1
 "richtext/syntaxhighlighter Example", "examples/richtext/syntaxhighlighter", "syntaxhighlighter", 0, -1
 "richtext/textobject Example", "examples/richtext/textobject", "textobject", 10, -1
+"sql/books Example", "examples/sql/books", "books", 0, -1
 "statemachine/eventtransitions Example", "examples/statemachine/eventtransitions", "eventtransitions", 10, -1
 "statemachine/rogue Example", "examples/statemachine/rogue", "rogue", 10, -1
 "statemachine/trafficlight Example", "examples/statemachine/trafficlight", "trafficlight", 0, -1