diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-25 14:53:09 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-25 14:53:09 (GMT) |
| commit | 8d720825279c8bf06d28b1f756031402f117002b (patch) | |
| tree | 5ea180f93387223c532d76f53d74054ea7a6f2b4 /doc/src/declarative/declarativeui.qdoc | |
| parent | 8928e37c8b1b375e74c5981915c034123de11b3d (diff) | |
| parent | d6197028818e51e78249b029a823fde1b0ffde03 (diff) | |
| download | Qt-8d720825279c8bf06d28b1f756031402f117002b.zip Qt-8d720825279c8bf06d28b1f756031402f117002b.tar.gz Qt-8d720825279c8bf06d28b1f756031402f117002b.tar.bz2 | |
Merge branch 'master' of git:qt/qt-qml
Conflicts:
src/declarative/graphicsitems/qdeclarativeparticles.cpp
Diffstat (limited to 'doc/src/declarative/declarativeui.qdoc')
| -rw-r--r-- | doc/src/declarative/declarativeui.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc index 1129f00..4b61bd9 100644 --- a/doc/src/declarative/declarativeui.qdoc +++ b/doc/src/declarative/declarativeui.qdoc @@ -88,10 +88,10 @@ completely new applications. QML is fully \l {Extending QML}{extensible from C+ \o \l {Network Transparency} \o \l {Data Models} \o \l {anchor-layout.html}{Anchor-based Layout} -\o \l {qmlstates.html}{States} -\o \l {qmlanimation.html}{Animation} -\o \l {qmlmodules.html}{Modules} -\o \l {qmlfocus.html}{Keyboard Focus} +\o \l {qdeclarativestates.html}{States} +\o \l {qdeclarativeanimation.html}{Animation} +\o \l {qdeclarativemodules.html}{Modules} +\o \l {qdeclarativefocus.html}{Keyboard Focus} \o \l {Extending types from QML} \o \l {Dynamic Object Creation} \endlist |