diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-02-23 13:20:55 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-02-23 13:20:55 (GMT) |
| commit | 7a476ac32f2d21fbffa1bcd09101148e15fbc17e (patch) | |
| tree | aee861c1f078b39e17a278612ef4efc72ef2842c /doc/src/declarative | |
| parent | 39ed27f1e382fbc594d2e5b6a23b2bc612b96e64 (diff) | |
| parent | 276ae3c231a80b5cf64ae431e9386ac63d48a278 (diff) | |
| download | Qt-7a476ac32f2d21fbffa1bcd09101148e15fbc17e.zip Qt-7a476ac32f2d21fbffa1bcd09101148e15fbc17e.tar.gz Qt-7a476ac32f2d21fbffa1bcd09101148e15fbc17e.tar.bz2 | |
Merge branch 'mimir' into 4.7
Conflicts:
doc/src/declarative/qdeclarativemodels.qdoc
doc/src/index.qdoc
doc/src/template/style/style.css
tools/qdoc3/atom.h
tools/qdoc3/doc.cpp
tools/qdoc3/doc/qdoc-manual.qdoc
tools/qdoc3/doc/qdoc-manual.qdocconf
Diffstat (limited to 'doc/src/declarative')
| -rw-r--r-- | doc/src/declarative/basictypes.qdoc | 3 | ||||
| -rw-r--r-- | doc/src/declarative/examples.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/declarative/positioners.qdoc | 10 |
3 files changed, 5 insertions, 9 deletions
diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc index 1d9e28c..02cd31a 100644 --- a/doc/src/declarative/basictypes.qdoc +++ b/doc/src/declarative/basictypes.qdoc @@ -153,9 +153,6 @@ Image { source: "pics/logo.png" } \endqml - \raw HTML - \endraw - \sa {QML Basic Types} */ diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc index be2d0c7..06bd819 100644 --- a/doc/src/declarative/examples.qdoc +++ b/doc/src/declarative/examples.qdoc @@ -147,7 +147,6 @@ The examples can be found in Qt's \c examples/declarative directory. \section2 Touch Interaction \list -\o \l{declarative/touchinteraction/gestures}{Gestures} \o \l{declarative/touchinteraction/mousearea}{MouseArea} \endlist diff --git a/doc/src/declarative/positioners.qdoc b/doc/src/declarative/positioners.qdoc index 0ac6a2b..763bc88 100644 --- a/doc/src/declarative/positioners.qdoc +++ b/doc/src/declarative/positioners.qdoc @@ -56,7 +56,7 @@ graphical elements: \section2 Column -\div{float-right} +\div {class="float-right"} \inlineimage qml-column.png \enddiv @@ -73,7 +73,7 @@ must be added to a parent Rectangle, if desired. \section2 Row -\div{float-right} +\div {class="float-right"} \inlineimage qml-row.png \enddiv @@ -90,7 +90,7 @@ left around the edges of the horizontally centered Row item. \section2 Grid -\div{float-right} +\div {class="float-right"} \inlineimage qml-grid-spacing.png \enddiv @@ -111,7 +111,7 @@ at the appropriate places in the Grid definition. \section2 Flow -\div{float-right} +\div {class="float-right"} \inlineimage qml-flow-text1.png \inlineimage qml-flow-text2.png \enddiv @@ -140,7 +140,7 @@ control of spacing between items and between lines of items. \section1 Repeaters -\div{float-right} +\div {class="float-right"} \inlineimage qml-repeater-grid-index.png \enddiv |