summaryrefslogtreecommitdiffstats
path: root/doc/src/overviews.qdoc
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-08-09 08:26:47 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-08-09 08:26:47 (GMT)
commitcfe96b7c99cb12a666111c7861aba74d535adc89 (patch)
treeeda2c872b4446b8b4796162ea46c86a4ba171cc9 /doc/src/overviews.qdoc
parent86eec3f6f98b387bf6a815c1a8e916965928b317 (diff)
parent1d09376c4eec88ba94f00a4b045fc425c5f51346 (diff)
downloadQt-cfe96b7c99cb12a666111c7861aba74d535adc89.zip
Qt-cfe96b7c99cb12a666111c7861aba74d535adc89.tar.gz
Qt-cfe96b7c99cb12a666111c7861aba74d535adc89.tar.bz2
Merge remote branch 'origin/4.7' into oslo-staging-2/4.7
Conflicts: doc/src/index.qdoc src/dbus/qdbusconnection.cpp src/gui/s60framework/qs60mainapplication.cpp src/gui/s60framework/qs60mainappui.cpp src/network/access/qnetworkrequest.cpp src/network/bearer/qnetworkconfiguration.h
Diffstat (limited to 'doc/src/overviews.qdoc')
-rw-r--r--doc/src/overviews.qdoc1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index c7b88cf..51456ef 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -29,6 +29,7 @@
\page overviews.html
\title All Overviews and HOWTOs
+ \ingroup qt-basic-concepts
\generatelist overviews
*/