summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
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 /doc/src/declarative
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 'doc/src/declarative')
-rw-r--r--doc/src/declarative/positioners.qdoc22
-rw-r--r--doc/src/declarative/qdeclarativemodels.qdoc4
2 files changed, 19 insertions, 7 deletions
diff --git a/doc/src/declarative/positioners.qdoc b/doc/src/declarative/positioners.qdoc
index ed320a1..d97acbd 100644
--- a/doc/src/declarative/positioners.qdoc
+++ b/doc/src/declarative/positioners.qdoc
@@ -53,7 +53,9 @@ graphical elements:
\section2 Column
-\floatright qml-column.png
+\div{float-right}
+\inlineimage qml-column.png
+\enddiv
\l Column items are used to vertically arrange items. The following example
uses a Column item to arrange three \l Rectangle items in an area defined
@@ -68,7 +70,9 @@ must be added to a parent Rectangle, if desired.
\section2 Row
-\floatright qml-row.png
+\div{float-right}
+\inlineimage qml-row.png
+\enddiv
\l Row items are used to horizontally arrange items. The following example
uses a Row item to arrange three rounded \l Rectangle items in an area defined
@@ -83,7 +87,9 @@ left around the edges of the horizontally centered Row item.
\section2 Grid
-\floatright qml-grid-spacing.png
+\div{float-right}
+\inlineimage qml-grid-spacing.png
+\enddiv
\l Grid items are used to place items in a grid or table arrangement.
The following example uses a Grid item to place four \l Rectangle items
@@ -102,8 +108,10 @@ at the appropriate places in the Grid definition.
\section2 Flow
-\floatright qml-flow-text1.png
-\floatright qml-flow-text2.png
+\div{float-right}
+\inlineimage qml-flow-text1.png
+\inlineimage qml-flow-text2.png
+\enddiv
\l Flow items are used to place items like words on a page, with rows or
columns of non-overlapping items.
@@ -129,7 +137,9 @@ control of spacing between items and between lines of items.
\section1 Repeaters
-\floatright qml-repeater-grid-index.png
+\div{float-right}
+\inlineimage qml-repeater-grid-index.png
+\enddiv
Repeaters create items from a template for use with positioners, using data
from a model. Combining repeaters and positioners is an easy way to lay out
diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc
index a61b115..495b3bd 100644
--- a/doc/src/declarative/qdeclarativemodels.qdoc
+++ b/doc/src/declarative/qdeclarativemodels.qdoc
@@ -504,7 +504,9 @@ a Web browser.
\l ListView shows a classic list of items with horizontal or vertical placing
of items.
-\floatright qml-listview-snippet.png
+\div{float-right}
+\inlineimage qml-listview-snippet.png
+\enddiv
The following example shows a minimal ListView displaying a sequence of
numbers (using an \l{QML Data Models#An Integer}{integer as a model}).