diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-26 21:42:57 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-26 21:42:57 (GMT) |
| commit | e028a54690f2fedfae6da19fb24b7401e4a71e56 (patch) | |
| tree | 72c038e84d9fb1063c970a121949d898442c5648 /doc/src/index.qdoc | |
| parent | d54407928be05781ede2358baba2f2f91749cc80 (diff) | |
| parent | 6661f5c2222c145d854e225076195b37672637d2 (diff) | |
| download | Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.zip Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.tar.gz Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h
Diffstat (limited to 'doc/src/index.qdoc')
| -rw-r--r-- | doc/src/index.qdoc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index bebd41a..2490374 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -39,6 +39,8 @@ \o \l{Qt Features Overview} \o \l{How to Learn Qt} \o \l{Introduction to Qt Quick}{Qt Quick} + \o \l{Qt Whitepaper}{Qt C++ Framework} + \o \l{Intro to Qt Quick}{Qt Quick} \o \l{external: Qt Mobility Manual}{Qt Mobility} \o \l{Qt WebKit} \endlist |