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 /src/declarative/graphicsitems/qdeclarativegridview.cpp | |
| 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 'src/declarative/graphicsitems/qdeclarativegridview.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativegridview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp index 8baaa50..0601b6f 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp @@ -1096,7 +1096,7 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m \snippet doc/src/snippets/declarative/gridview/ContactModel.qml 0 - \div {float-right} + \div {class="float-right"} \inlineimage gridview-simple.png \enddiv @@ -1112,7 +1112,7 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m \codeline \snippet doc/src/snippets/declarative/gridview/gridview.qml classdocs simple - \div {float-right} + \div {class="float-right"} \inlineimage gridview-highlight.png \enddiv |