1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move some other examples around in the docs.

Browse Source 
Change-Id: Ib50600ff9fd3d807b82a152abd7d587196d5b5e3
Reviewed-on: http://codereview.qt.nokia.com/932
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie
This commit is contained in:
Casper van Donderen 2011-06-30 09:42:52 +02:00 committed by Qt by Nokia
parent 192eae5797
commit 1734cb55c5
14 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/demos/deform.qdoc → doc/src/examples/deform.qdoc
View File

@ -26,10 +26,10 @@
****************************************************************************/
/*!
\example demos/deform
\example painting/deform
\title Vector Deformation
This demo shows how to use advanced vector techniques to draw text
This example shows how to use advanced vector techniques to draw text
using a \c QPainterPath.
\image deform-demo.png

4
doc/src/demos/digiflip.qdoc → doc/src/examples/digiflip.qdoc
View File

@ -26,6 +26,6 @@
****************************************************************************/
/*!
\example demos/embedded/digiflip
\title Digiflip Demonstration
\example embedded/digiflip
\title Digiflip
*/

2
doc/src/demos/embeddeddialogs.qdoc → doc/src/examples/embeddeddialogs.qdoc
View File

@ -26,7 +26,7 @@
****************************************************************************/
/*!
\example demos/embeddeddialogs
\example graphicsview/embeddeddialogs
\title Embedded Dialogs
This example shows how to embed standard dialogs into

4
doc/src/demos/flickable.qdoc → doc/src/examples/flickable.qdoc
View File

@ -26,8 +26,8 @@
****************************************************************************/
/*!
\example demos/embedded/flickable
\title Flickable List Demonstration
\example embedded/flickable
\title Flickable List
\image flickable-demo.png
*/

4
doc/src/demos/flightinfo.qdoc → doc/src/examples/flightinfo.qdoc
View File

@ -26,8 +26,8 @@
****************************************************************************/
/*!
\example demos/embedded/flightinfo
\title Flight Info Demonstration
\example embedded/flightinfo
\title Flight Info
\image flightinfo-demo.png
*/

4
doc/src/demos/gradients.qdoc → doc/src/examples/gradients.qdoc
View File

@ -26,10 +26,10 @@
****************************************************************************/
/*!
\example demos/gradients
\example painting/gradients
\title Gradients
In this demo we show the various types of gradients that can
In this example we show the various types of gradients that can
be used in Qt.
\image gradients-demo.png

4
doc/src/demos/lightmaps.qdoc → doc/src/examples/lightmaps.qdoc
View File

@ -26,8 +26,8 @@
****************************************************************************/
/*!
\example demos/embedded/lightmaps
\title Light Maps Demonstration
\example embedded/lightmaps
\title Light Maps
\image lightmaps-demo.png
*/

4
doc/src/demos/raycasting.qdoc → doc/src/examples/raycasting.qdoc
View File

@ -26,8 +26,8 @@
****************************************************************************/
/*!
\example demos/embedded/raycasting
\title Ray Casting Demonstration
\example embedded/raycasting
\title Ray Casting
\image raycasting-demo.png
*/

4
doc/src/demos/styledemo.qdoc → doc/src/examples/styledemo.qdoc
View File

@ -26,8 +26,8 @@
****************************************************************************/
/*!
\example demos/embedded/styledemo
\title Embedded Styles Demonstration
\example embedded/styledemo
\title Embedded Styles
\image styledemo-demo.png
*/

14
src/gui/painting/qbrush.cpp
View File

@ -1307,7 +1307,7 @@ QDataStream &operator>>(QDataStream &s, QBrush &b)
{coordinate mode} use coordinateMode().
\sa {demos/gradients}{The Gradients Demo}, QBrush
\sa {painting/gradients}{The Gradients Example}, QBrush
*/
/*!
@ -1617,8 +1617,8 @@ bool QGradient::operator==(const QGradient &gradient)
returns the final stop point of the gradient, and the start()
function returning the start point of the gradient.
\sa QRadialGradient, QConicalGradient, {demos/gradients}{The
Gradients Demo}
\sa QRadialGradient, QConicalGradient, {painting/gradients}{The
Gradients Example}
*/
@ -1803,8 +1803,8 @@ void QLinearGradient::setFinalStop(const QPointF &stop)
radius() functions returning the gradient's center, focal point
and radius respectively.
\sa QLinearGradient, QConicalGradient, {demos/gradients}{The
Gradients Demo}
\sa QLinearGradient, QConicalGradient, {painting/gradients}{The
Gradients Example}
*/
static QPointF qt_radial_gradient_adapt_focal_point(const QPointF &center,
@ -2173,8 +2173,8 @@ void QRadialGradient::setFocalPoint(const QPointF &focalPoint)
gradient can be specified through its radius or final stop points,
respectively.
\sa QLinearGradient, QRadialGradient, {demos/gradients}{The
Gradients Demo}
\sa QLinearGradient, QRadialGradient, {painting/gradients}{The
Gradients Example}
*/

10
src/gui/painting/qpainter.cpp
View File

@ -1119,9 +1119,9 @@ void QPainterPrivate::updateState(QPainterState *newState)
function that draws the outline of the given path (i.e. strokes
the path).
See also the \l {demos/deform}{Vector Deformation} demo which
See also the \l {painting/deform}{Vector Deformation} example which
shows how to use advanced vector techniques to draw text using a
QPainterPath, the \l {demos/gradients}{Gradients} demo which shows
QPainterPath, the \l {painting/gradients}{Gradients} example which shows
the different types of gradients that are available in Qt, and the \l
{demos/pathstroke}{Path Stroking} demo which shows Qt's built-in
dash patterns and shows how custom patterns can be used to extend
@ -1129,8 +1129,8 @@ void QPainterPrivate::updateState(QPainterState *newState)
\table
\header
\o \l {demos/deform}{Vector Deformation}
\o \l {demos/gradients}{Gradients}
\o \l {painting/deform}{Vector Deformation}
\o \l {painting/gradients}{Gradients}
\o \l {demos/pathstroke}{Path Stroking}
\row
\o \inlineimage qpainter-vectordeformation.png
@ -3413,7 +3413,7 @@ void QPainter::fillPath(const QPainterPath &path, const QBrush &brush)
\endtable
\sa {painting/painterpaths}{the Painter Paths
example},{demos/deform}{the Vector Deformation demo}
example},{painting/deform}{the Vector Deformation example}
*/
void QPainter::drawPath(const QPainterPath &path)
{

8
src/gui/painting/qpainterpath.cpp
View File

@ -305,19 +305,19 @@ static void qt_debug_path(const QPainterPath &path)
\section1 Examples
Qt provides the \l {painting/painterpaths}{Painter Paths Example}
and the \l {demos/deform}{Vector Deformation Demo} which are
located in Qt's example and demo directories respectively.
and the \l {painting/deform}{Vector Deformation example} which are
located in Qt's example directory.
The \l {painting/painterpaths}{Painter Paths Example} shows how
painter paths can be used to build complex shapes for rendering
and lets the user experiment with the filling and stroking. The
\l {demos/deform}{Vector Deformation Demo} shows how to use
\l {painting/deform}{Vector Deformation Example} shows how to use
QPainterPath to draw text.
\table
\header
\o \l {painting/painterpaths}{Painter Paths Example}
\o \l {demos/deform}{Vector Deformation Demo}
\o \l {painting/deform}{Vector Deformation Example}
\row
\o \inlineimage qpainterpath-example.png
\o \inlineimage qpainterpath-demo.png

3
tests/auto/guiapplauncher/demos.txt
View File

@ -1,6 +1,3 @@
"Deform Demo", "demos/deform", "deform", 0, -1
"Embeddeddialogs Demo", "demos/embeddeddialogs", "embeddeddialogs", 0, -1
"Gradients Demo", "demos/gradients", "gradients", 0, -1
"Interview Demo", "demos/interview", "interview", 0, -1
"Mainwindow Demo", "demos/mainwindow", "mainwindow", 0, -1
"PathStroke Demo", "demos/pathstroke", "pathstroke", 0, -1

3
tests/auto/guiapplauncher/examples.txt
View File

@ -20,6 +20,7 @@
"graphicsview/diagramscene Example", "examples/graphicsview/diagramscene", "diagramscene", 10, -1
"graphicsview/dragdroprobot Example", "examples/graphicsview/dragdroprobot", "dragdroprobot", 10, -1
"graphicsview/elasticnodes Example", "examples/graphicsview/elasticnodes", "elasticnodes", 10, -1
"graphicsview/embeddeddialogs Example", "examples/graphicsview/embeddeddialogs", "embeddeddialogs", 0, -1
"graphicsview/flowlayout Example", "examples/graphicsview/flowlayout", "flowlayout", 10, -1
"graphicsview/padnavigator Example", "examples/graphicsview/padnavigator", "padnavigator", 0, -1
"graphicsview/portedasteroids Example", "examples/graphicsview/portedasteroids", "portedasteroids", 10, -1
@ -66,7 +67,9 @@
"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/deform Example", "examples/painting/deform", "deform", 0, -1
"painting/fontsampler Example", "examples/painting/fontsampler", "fontsampler", 0, -1
"painting/gradients Example", "examples/painting/gradients", "gradients", 0, -1
"painting/imagecomposition Example", "examples/painting/imagecomposition", "imagecomposition", 10, -1
"painting/painterpaths Example", "examples/painting/painterpaths", "painterpaths", 10, -1
"painting/transformations Example", "examples/painting/transformations", "transformations", 0, -1