summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-12-14 15:07:48 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-12-14 15:07:48 (GMT)
commitcbfeb79c80a774166e016e7c879bba465ffc0496 (patch)
treee8242de08e3a0e27d86782ea9cc694260411bff1 /src/declarative/graphicsitems
parentbf835c2e69b3bc37145e572f68554bf771eeec3f (diff)
downloadQt-cbfeb79c80a774166e016e7c879bba465ffc0496.zip
Qt-cbfeb79c80a774166e016e7c879bba465ffc0496.tar.gz
Qt-cbfeb79c80a774166e016e7c879bba465ffc0496.tar.bz2
Doc: Used div elements for floats, updated the style sheet.
Diffstat (limited to 'src/declarative/graphicsitems')
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable.cpp4
-rw-r--r--src/declarative/graphicsitems/qdeclarativegridview.cpp4
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea.cpp4
-rw-r--r--src/declarative/graphicsitems/qdeclarativerectangle.cpp20
4 files changed, 24 insertions, 8 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 1899a39..cd770d4 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -373,7 +373,9 @@ void QDeclarativeFlickablePrivate::updateBeginningEnd()
\section1 Example Usage
- \floatright flickable.gif
+ \div {float-right}
+ \inlineimage flickable.gif
+ \enddiv
The following example shows a small view onto a large image in which the
user can drag or flick the image in order to view different parts of it.
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index c7517f4..ba66aba 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1095,7 +1095,9 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
\snippet doc/src/snippets/declarative/gridview/ContactModel.qml 0
- \floatright gridview-simple.png
+ \div {float-right}
+ \inlineimage gridview-simple.png
+ \enddiv
This model can be referenced as \c ContactModel in other QML files. See \l{QML Modules}
for more information about creating reusable components like this.
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index 56e5c6b..3d5c29f 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -216,7 +216,9 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
\section1 Example Usage
- \floatright qml-mousearea-snippet.png
+ \div {float-right}
+ \inlineimage qml-mousearea-snippet.png
+ \enddiv
The following example uses a MouseArea in a \l Rectangle that changes
the \l Rectangle color to red when clicked:
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
index 969027e..7bb6afb 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -131,7 +131,9 @@ void QDeclarativeGradientStop::updateGradient()
\section1 Example Usage
- \floatright qml-gradient.png
+ \div {float-right}
+ \inlineimage qml-gradient.png
+ \enddiv
The following example declares a \l Rectangle item with a gradient starting
with red, blending to yellow at one third of the height of the rectangle,
@@ -215,7 +217,9 @@ void QDeclarativeGradient::doUpdate()
\section1 Example Usage
- \floatright declarative-rect.png
+ \div {float-right}
+ \inlineimage declarative-rect.png
+ \enddiv
The following example shows the effects of some of the common properties on a
Rectangle item, which in this case is used to create a square:
@@ -265,7 +269,9 @@ void QDeclarativeRectangle::doUpdate()
rectangle (as documented for QRect rendering). This can cause unintended effects if
\c border.width is 1 and the rectangle is \l{Item::clip}{clipped} by a parent item:
- \floatright rect-border-width.png
+ \div {float-right}
+ \inlineimage rect-border-width.png
+ \enddiv
\snippet doc/src/snippets/declarative/rectangle/rect-border-width.qml 0
@@ -287,7 +293,9 @@ QDeclarativePen *QDeclarativeRectangle::border()
This property allows for the construction of simple vertical gradients.
Other gradients may by formed by adding rotation to the rectangle.
- \floatleft declarative-rect_gradient.png
+ \div {float-left}
+ \inlineimage declarative-rect_gradient.png
+ \enddiv
\snippet doc/src/snippets/declarative/rectangle/rectangle-gradient.qml rectangles
\clearfloat
@@ -353,7 +361,9 @@ void QDeclarativeRectangle::setRadius(qreal radius)
The default color is white.
- \floatright rect-color.png
+ \div {float-right}
+ \inlineimage rect-color.png
+ \enddiv
The following example shows rectangles with colors specified
using hexadecimal and named color notation: