summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2011-07-01 14:59:19 +0200
committerQt by Nokia <qt-info@nokia.com>2011-07-05 21:19:08 +0200
commit1631be8176d51ae67cdf1627c3fdf459e2e0937b (patch)
tree7f37cbcf0743cbe038df968b763a97bf26fbda50 /doc/src
parent1734cb55c5049ae7bead9ed5474f067ee6536e4f (diff)
Update the documentation after moving examples.
Change-Id: I7aa52785979df9eddd7b91e62abd0ef10adc74b7 Reviewed-on: http://codereview.qt.nokia.com/1031 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/examples/interview.qdoc (renamed from doc/src/demos/interview.qdoc)4
-rw-r--r--doc/src/examples/macmainwindow.qdoc (renamed from doc/src/demos/macmainwindow.qdoc)8
-rw-r--r--doc/src/examples/mainwindow.qdoc (renamed from doc/src/demos/mainwindow.qdoc)4
-rw-r--r--doc/src/examples/pathstroke.qdoc (renamed from doc/src/demos/pathstroke.qdoc)4
-rw-r--r--doc/src/examples/spreadsheet.qdoc (renamed from doc/src/demos/spreadsheet.qdoc)4
-rw-r--r--doc/src/examples/sqlbrowser.qdoc (renamed from doc/src/demos/sqlbrowser.qdoc)4
-rw-r--r--doc/src/examples/sub-attaq.qdoc (renamed from doc/src/demos/sub-attaq.qdoc)4
-rw-r--r--doc/src/examples/textedit.qdoc (renamed from doc/src/demos/textedit.qdoc)4
-rw-r--r--doc/src/examples/undo.qdoc (renamed from doc/src/demos/undo.qdoc)4
9 files changed, 20 insertions, 20 deletions
diff --git a/doc/src/demos/interview.qdoc b/doc/src/examples/interview.qdoc
index fa40ed24e8..0be40fda85 100644
--- a/doc/src/demos/interview.qdoc
+++ b/doc/src/examples/interview.qdoc
@@ -26,10 +26,10 @@
****************************************************************************/
/*!
- \example demos/interview
+ \example itemviews/interview
\title Interview
- The Interview demonstration explores the flexibility and scalability of the
+ The Interview example explores the flexibility and scalability of the
model/view framework by presenting an infinitely deep data structure using a model
and three different types of view.
diff --git a/doc/src/demos/macmainwindow.qdoc b/doc/src/examples/macmainwindow.qdoc
index 31c02307e7..d245398f4f 100644
--- a/doc/src/demos/macmainwindow.qdoc
+++ b/doc/src/examples/macmainwindow.qdoc
@@ -26,17 +26,17 @@
****************************************************************************/
/*!
- \example demos/macmainwindow
- \title Mac Main Window Demo
+ \example mainwindows/macmainwindow
+ \title Mac Main Window Example
- This demo shows how to create a main window that has the
+ This example shows how to create a main window that has the
same appearance as other Mac OS X applications such as Mail or iTunes.
This includes customizing the item views and QSplitter and wrapping native
widgets such as the search field.
\image macmainwindow.png
- See \c{$QTDIR/demos/macmainwindow} for the source code.
+ See \c{$QTDIR/examples/mainwindows/macmainwindow} for the source code.
*/
diff --git a/doc/src/demos/mainwindow.qdoc b/doc/src/examples/mainwindow.qdoc
index dee72022af..ef9d128628 100644
--- a/doc/src/demos/mainwindow.qdoc
+++ b/doc/src/examples/mainwindow.qdoc
@@ -26,10 +26,10 @@
****************************************************************************/
/*!
- \example demos/mainwindow
+ \example mainwindows/mainwindow
\title Main Window
- The Main Window demonstration shows Qt's extensive support for tool bars,
+ The Main Window example shows Qt's extensive support for tool bars,
dock windows, menus, and other standard application features.
\image mainwindow-demo.png
diff --git a/doc/src/demos/pathstroke.qdoc b/doc/src/examples/pathstroke.qdoc
index 8e864e2615..b433a42814 100644
--- a/doc/src/demos/pathstroke.qdoc
+++ b/doc/src/examples/pathstroke.qdoc
@@ -26,10 +26,10 @@
****************************************************************************/
/*!
- \example demos/pathstroke
+ \example painting/pathstroke
\title Path Stroking
- In this demo we show some of the various types of pens that can be
+ In this example we show some of the various types of pens that can be
used in Qt.
\image pathstroke-demo.png
diff --git a/doc/src/demos/spreadsheet.qdoc b/doc/src/examples/spreadsheet.qdoc
index 5c6b4dfb26..8bcecc99ed 100644
--- a/doc/src/demos/spreadsheet.qdoc
+++ b/doc/src/examples/spreadsheet.qdoc
@@ -26,10 +26,10 @@
****************************************************************************/
/*!
- \example demos/spreadsheet
+ \example itemviews/spreadsheet
\title Spreadsheet
- The Spreadsheet demonstration shows how a table view can be used to create a
+ The Spreadsheet example shows how a table view can be used to create a
simple spreadsheet application. Custom delegates are used to render different
types of data in distinctive colors.
diff --git a/doc/src/demos/sqlbrowser.qdoc b/doc/src/examples/sqlbrowser.qdoc
index 53af037be0..f7ec7951a8 100644
--- a/doc/src/demos/sqlbrowser.qdoc
+++ b/doc/src/examples/sqlbrowser.qdoc
@@ -26,10 +26,10 @@
****************************************************************************/
/*!
- \example demos/sqlbrowser
+ \example sql/sqlbrowser
\title SQL Browser
- The SQL Browser demonstration shows how a data browser can be used to visualize
+ The SQL Browser example shows how a data browser can be used to visualize
the results of SQL statements on a live database.
\image sqlbrowser-demo.png
diff --git a/doc/src/demos/sub-attaq.qdoc b/doc/src/examples/sub-attaq.qdoc
index 247d0d1fa9..0c8e587463 100644
--- a/doc/src/demos/sub-attaq.qdoc
+++ b/doc/src/examples/sub-attaq.qdoc
@@ -26,10 +26,10 @@
****************************************************************************/
/*!
- \example demos/sub-attaq
+ \example animation/sub-attaq
\title Sub-Attaq
- This demo shows Qt's ability to combine \l{The Animation Framework}{the animation framework}
+ This example shows Qt's ability to combine \l{The Animation Framework}{the animation framework}
and \l{The State Machine Framework}{the state machine framework} to create a game.
\image sub-attaq-demo.png
diff --git a/doc/src/demos/textedit.qdoc b/doc/src/examples/textedit.qdoc
index 8c50dbacf8..1a1171d542 100644
--- a/doc/src/demos/textedit.qdoc
+++ b/doc/src/examples/textedit.qdoc
@@ -26,10 +26,10 @@
****************************************************************************/
/*!
- \example demos/textedit
+ \example richtext/textedit
\title Text Edit
- The Text Edit demonstration shows Qt's rich text editing facilities in action,
+ The Text Edit example shows Qt's rich text editing facilities in action,
providing an example document for you to experiment with.
\image textedit-demo.png
diff --git a/doc/src/demos/undo.qdoc b/doc/src/examples/undo.qdoc
index 7b64371f38..29c320ab05 100644
--- a/doc/src/demos/undo.qdoc
+++ b/doc/src/examples/undo.qdoc
@@ -26,10 +26,10 @@
****************************************************************************/
/*!
- \example demos/undo
+ \example tools/undo
\title Undo Framework
- This demo shows Qt's undo framework in action.
+ This example shows Qt's undo framework in action.
\image undodemo.png