summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-03 10:36:16 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-03 10:36:16 (GMT)
commit9b77de3effdb2eb7d6df212ab9a8a19551ecb550 (patch)
treeb805d65324498a377e3732c5ca3615df0f1c7750 /doc/src
parent32ecf8e8ad326ea13ec9a430c99ce540e8b4efac (diff)
parentcfa3b8f2a7a3b3122fdff7781e32066e0d7f8d66 (diff)
downloadQt-9b77de3effdb2eb7d6df212ab9a8a19551ecb550.zip
Qt-9b77de3effdb2eb7d6df212ab9a8a19551ecb550.tar.gz
Qt-9b77de3effdb2eb7d6df212ab9a8a19551ecb550.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a small typo: therfore -> therefore Fix a small typo in setColor description (brush -> color) only add phonon and scripttools dependencies if they're available, otherwise linking will fail s/INCPATH/INCLUDEPATH/ qdoc: Added breadcrumbs for most other pages.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/classes.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/classes.qdoc b/doc/src/classes.qdoc
index 6ba31a2..1552f56 100644
--- a/doc/src/classes.qdoc
+++ b/doc/src/classes.qdoc
@@ -59,7 +59,7 @@
/*!
\page classes.html
- \title All Qt Classes (main index)
+ \title All Qt Classes
\ingroup classlists
\brief If you know the name of the class you want, find it here.
@@ -146,7 +146,7 @@
/*!
\page functions.html
- \title All Functions (main index)
+ \title All Functions
\ingroup funclists
\brief All documented Qt functions listed alphabetically with a