diff options
| author | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-09-15 07:45:55 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-15 07:46:55 (GMT) |
| commit | f78119906b0ffc7fd3dd36d6d827d456478a7fd5 (patch) | |
| tree | e161fe397dedd702f86d186ef32eabcf7cae00d8 /doc | |
| parent | 66420856664c7a412b3c9efe4be6ff7a6061e5f2 (diff) | |
| parent | 05ab8ad1577fc038aa2b3bd96cedda54e6a64979 (diff) | |
| download | Qt-f78119906b0ffc7fd3dd36d6d827d456478a7fd5.zip Qt-f78119906b0ffc7fd3dd36d6d827d456478a7fd5.tar.gz Qt-f78119906b0ffc7fd3dd36d6d827d456478a7fd5.tar.bz2 | |
git Merge branch '4.7-upstream' into 4.7-doc
Conflicts:
src/gui/kernel/qgesturemanager.cpp
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/index.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index edb4d1e..77856ec 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -77,7 +77,7 @@ <ul> <li><a href="qtquick.html">Qt Quick</a></li> <li><a href="qdeclarativeintroduction.html">Introduction to QML</a></li> - <li><a href="qmlelements.html">QML Elements</a></li> + <li><a href="qdeclarativeelements.html">QML Elements</a></li> <li><a href="qdeclarativeexamples.html">QML Examples and Demos</a></li> </ul> </div> |