summaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2011-07-11 13:40:02 +0200
committerQt by Nokia <qt-info@nokia.com>2011-07-12 15:32:52 +0200
commit33e74809f5e4bf44a4f99959c291eb30b1f286de (patch)
tree5e0ac39f8b33bdb898df36b23495d643bc48736b /doc/src
parent73fff1ffc520e4c9f9bf05da10640325570ed2f3 (diff)
downloadqtsvg-33e74809f5e4bf44a4f99959c291eb30b1f286de.tar.gz
Merge demos and examples
Change-Id: Iaa84519e5adaa7736b245c831c7cec7ff9453191 Reviewed-on: http://codereview.qt.nokia.com/1419 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/desktopservices.qdoc (renamed from doc/src/demos/desktopservices.qdoc)4
-rw-r--r--doc/src/examples/embeddedsvgviewer.qdoc (renamed from doc/src/demos/embeddedsvgviewer.qdoc)4
-rw-r--r--doc/src/examples/fluidlauncher.qdoc (renamed from doc/src/demos/fluidlauncher.qdoc)4
-rw-r--r--doc/src/examples/weatherinfo.qdoc (renamed from doc/src/demos/weatherinfo.qdoc)4
4 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/demos/desktopservices.qdoc b/doc/src/examples/desktopservices.qdoc
index f1abed8..7def082 100644
--- a/doc/src/demos/desktopservices.qdoc
+++ b/doc/src/examples/desktopservices.qdoc
@@ -26,8 +26,8 @@
****************************************************************************/
/*!
- \example demos/embedded/desktopservices
- \title Embedded Desktop Services Demonstration
+ \example embedded/desktopservices
+ \title Embedded Desktop Services
\image embeddeddesktopservices-demo.png
*/
diff --git a/doc/src/demos/embeddedsvgviewer.qdoc b/doc/src/examples/embeddedsvgviewer.qdoc
index 044923a..dc5890c 100644
--- a/doc/src/demos/embeddedsvgviewer.qdoc
+++ b/doc/src/examples/embeddedsvgviewer.qdoc
@@ -26,8 +26,8 @@
****************************************************************************/
/*!
- \example demos/embedded/embeddedsvgviewer
- \title Embedded SVG Viewer Demonstration
+ \example embedded/embeddedsvgviewer
+ \title Embedded SVG Viewer
\image embeddedsvgviewer-demo.png
*/
diff --git a/doc/src/demos/fluidlauncher.qdoc b/doc/src/examples/fluidlauncher.qdoc
index 42623e8..fdaeb1e 100644
--- a/doc/src/demos/fluidlauncher.qdoc
+++ b/doc/src/examples/fluidlauncher.qdoc
@@ -26,8 +26,8 @@
****************************************************************************/
/*!
- \example demos/embedded/fluidlauncher
- \title Fluid Launcher Demonstration
+ \example embedded/fluidlauncher
+ \title Fluid Launcher
\image fluidlauncher-demo.png
*/
diff --git a/doc/src/demos/weatherinfo.qdoc b/doc/src/examples/weatherinfo.qdoc
index 1f8a3e8..29a1682 100644
--- a/doc/src/demos/weatherinfo.qdoc
+++ b/doc/src/examples/weatherinfo.qdoc
@@ -26,8 +26,8 @@
****************************************************************************/
/*!
- \example demos/embedded/weatherinfo
- \title Weather Info Demonstration
+ \example embedded/weatherinfo
+ \title Weather Info
\image weatherinfo-demo.png
*/