summaryrefslogtreecommitdiffstats
path: root/doc/src/index.qdoc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-27 01:43:46 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-27 01:43:46 (GMT)
commite2c2e7e7fb3bee99260dc5b7bfab42c9217c18c8 (patch)
treec466ef854854b646f590efbd63563fd872177880 /doc/src/index.qdoc
parent20b1263695169e88207c8a4c4aac968a6044931b (diff)
parente028a54690f2fedfae6da19fb24b7401e4a71e56 (diff)
downloadQt-e2c2e7e7fb3bee99260dc5b7bfab42c9217c18c8.zip
Qt-e2c2e7e7fb3bee99260dc5b7bfab42c9217c18c8.tar.gz
Qt-e2c2e7e7fb3bee99260dc5b7bfab42c9217c18c8.tar.bz2
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fixed use of deleted object in XmlPatterns EvaluationCache Crash when creating scroll bar skin graphics on S60 (debug only) QS60Style omits drawing theme background in some Symbian SDKs Fix for qml1shaderplugin GPU resource handling on Symbian Make it easier to select words at the start of a line. Doc: Fixing typo In landscape mode QComboboBox popup can not be showed completely Fix left alignment of native RTL pre-edit text.
Diffstat (limited to 'doc/src/index.qdoc')
-rw-r--r--doc/src/index.qdoc2
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