Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
  Fix QRegion under Mac OS X.
  update according to Thiago's comments.
  Changes: add functionality for dbus auto start to qt
  Add license header to this file
  readdir64 is not available on HP-UX
  Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath
  qdoc3:	Completed handling of the new \pagekeywords command.
  Wrong cursor shown by the parent window after setOverrideCursor().
  Fixed Mac OS X compile time error by using GLint for temp.
  qdoc3:	Added curly braces in switch statement for braindead compiler.
  qdoc: Added a build rule for the documentation - disabled by default.
  Doc: Added the qdoc manual to the repository for future maintenance.
  qdoc3:	Fixed bug in creation of qt.pageindex.
  qdoc3:	Added capability to create qt.pageindex.
  Incorrect property setter generated by dumpcpp for Microsoft Word 2007.
  Cocoa: Implement our own NSApplication subclass
  Cocoa: Menu in menubar stays highlighted
  qdoc: Made a temporary fix for comment highlighting.
  Doc: Tidied up the class layout and removed an unnecessary image.
  Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.
  ...

84 files changed, 11652 insertions, 602 deletions

diff --git a/doc/doc.pri b/doc/doc.pri
index 9d7d5da..0fc4d72 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -31,8 +31,14 @@ QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdoc
                     $$GENERATOR doc-build/html-qml/qml.qhp -o doc/qch/qml.qch \
                )
 
+QT_ZH_CN_DOCUMENTATION = ($$QDOC qt-api-only_zh_CN.qdocconf) && \
+               (cd $$QT_BUILD_TREE && \
+                    $$GENERATOR doc-build/html-qt_zh_CN/qt.qhp -o doc/qch/qt_zh_CN.qch \
+               )
+
 win32-g++:isEmpty(QMAKE_SH) {
 	QT_DOCUMENTATION = $$replace(QT_DOCUMENTATION, "/", "\\\\")
+	QT_ZH_CN_DOCUMENTATION = $$replace(QT_ZH_CN_DOCUMENTATION, "/", "\\\\")
 }
 
 # Build rules:
@@ -43,6 +49,9 @@ qch_docs.depends += sub-tools
 
 docs.depends = adp_docs qch_docs
 
+docs_zh_CN.depends = docs
+docs_zh_CN.commands = $$QT_ZH_CN_DOCUMENTATION
+
 # Install rules
 htmldocs.files = $$QT_BUILD_TREE/doc/html
 htmldocs.path = $$[QT_INSTALL_DOCS]
@@ -55,5 +64,5 @@ qchdocs.CONFIG += no_check_exist
 docimages.files = $$QT_BUILD_TREE/doc/src/images
 docimages.path = $$[QT_INSTALL_DOCS]/src
 
-QMAKE_EXTRA_TARGETS += qdoc adp_docs qch_docs docs
+QMAKE_EXTRA_TARGETS += qdoc adp_docs qch_docs docs docs_zh_CN
 INSTALLS += htmldocs qchdocs docimages
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index b710449..bb2effa 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -116,9 +116,9 @@
 
     \hr
 
-    Copyright (C) 2004,2007  Red Hat, Inc.\br
-    Copyright (C) 1998-2004  David Turner and Werner Lemberg\br
-    Copyright (C) 2006  Behdad Esfahbod\br
+    Copyright (C) 2004,2007  Red Hat, Inc.\br
+    Copyright (C) 1998-2004  David Turner and Werner Lemberg\br
+    Copyright (C) 2006  Behdad Esfahbod\br
     Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
 
     This is part of HarfBuzz, an OpenType Layout engine library.
@@ -137,7 +137,7 @@
 
     THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
     BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+    FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
     ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
     PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
@@ -323,7 +323,7 @@
     duplicated in all such forms and that any documentation,
     advertising materials, and other materials related to such
     distribution and use acknowledge that the software was developed
-    by the University of California, Berkeley.  The name of the
+    by the University of California, Berkeley.  The name of the
     University may not be used to endorse or promote products derived
     from this software without specific prior written permission.
     THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
@@ -364,7 +364,7 @@
     documentation for such software.
 
     THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
-    WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
+    WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
     REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
     OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
 
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 9e680a6..344ebd4 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -276,14 +276,14 @@
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:\br
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.\br
-        * Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the
-          documentation and/or other materials provided with the distribution.\br
-        * Neither the name of Research In Motion Limited nor the
-          names of its contributors may be used to endorse or promote products
-          derived from this software without specific prior written permission.
+        * Redistributions of source code must retain the above copyright
+          notice, this list of conditions and the following disclaimer.\br
+        * Redistributions in binary form must reproduce the above copyright
+          notice, this list of conditions and the following disclaimer in the
+          documentation and/or other materials provided with the distribution.\br
+        * Neither the name of Research In Motion Limited nor the
+          names of its contributors may be used to endorse or promote products
+          derived from this software without specific prior written permission.
 
     THIS SOFTWARE IS PROVIDED BY Research In Motion Limited ''AS IS'' AND ANY
     EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc
index a7b5764..23d0cf6 100644
--- a/doc/src/legal/trademarks.qdoc
+++ b/doc/src/legal/trademarks.qdoc
@@ -47,7 +47,7 @@
     \brief Information about trademarks owned by Nokia and other organisations.
 
     Nokia, the Nokia logo, Qt, and the Qt logo are trademarks of Nokia
-    Corporation and/or its subsidiaries in Finland and other countries.
+    Corporation and/or its subsidiaries in Finland and other countries.
 
     \list
     \o Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of
diff --git a/doc/src/tutorials/addressbook-fr.qdoc b/doc/src/tutorials/addressbook-fr.qdoc
index d3bd1ca..98c44a3 100644
--- a/doc/src/tutorials/addressbook-fr.qdoc
+++ b/doc/src/tutorials/addressbook-fr.qdoc
@@ -47,47 +47,47 @@
     \nextpage {tutorials/addressbook-fr/part1}{Chapitre 1}
 
     \title Tutoriel "Carnet d'adresses"
-    \brief Une introduction à la programation d'interface graphique montrant comment construire une application simple avec Qt.
+    \brief Une introduction à la programation d'interface graphique montrant comment construire une application simple avec Qt.
 
-    Ce tutoriel est une introduction à la programmation de GUI (interface utilisateur)
-    à l'aide des outils fournis par la plateforme multiplate-forme Qt.
+    Ce tutoriel est une introduction à la programmation de GUI (interface utilisateur)
+    à l'aide des outils fournis par la plateforme multiplate-forme Qt.
 
     \image addressbook-tutorial-screenshot.png
 
-    Ce tutoriel va nous amener à découvrir quelques technologies fondamentales fournies 
+    Ce tutoriel va nous amener à découvrir quelques technologies fondamentales fournies 
     par Qt, tel que:
 
     \list
-    \o Les Widgets et leur mise en page à l'aide des layouts
+    \o Les Widgets et leur mise en page à l'aide des layouts
     \o Les signaux et slots
-    \o Les structures de données de collections
-    \o Les entrées/sorties
+    \o Les structures de données de collections
+    \o Les entrées/sorties
     \endlist
 
     Si c'est votre premier contact avec Qt, lisez \l{How to Learn Qt}{Comment apprendre Qt}
-    si ce n'est déjà fait.
+    si ce n'est déjà fait.
 
-    Le code source du tutoriel est distribué avec Qt dans le dossier \c examples/tutorials/addressbook
+    Le code source du tutoriel est distribué avec Qt dans le dossier \c examples/tutorials/addressbook
 
     Les chapitres du tutoriel:
 
     \list 1
     \o \l{tutorials/addressbook-fr/part1}{Conception de l'interface utilisateur}
     \o \l{tutorials/addressbook-fr/part2}{Ajouter des adresses}
-    \o \l{tutorials/addressbook-fr/part3}{Navigation entre les éléments}
-    \o \l{tutorials/addressbook-fr/part4}{éditer et supprimer des adresses}
+    \o \l{tutorials/addressbook-fr/part3}{Navigation entre les éléments}
+    \o \l{tutorials/addressbook-fr/part4}{éditer et supprimer des adresses}
     \o \l{tutorials/addressbook-fr/part5}{Ajout d'une fonction de recherche}
     \o \l{tutorials/addressbook-fr/part6}{Sauvegarde et chargement}
-    \o \l{tutorials/addressbook-fr/part7}{Fonctionnalités avancées}
+    \o \l{tutorials/addressbook-fr/part7}{Fonctionnalités avancées}
     \endlist
 
-    La petite application que nous développerons ici ne possède pas tous les éléments
+    La petite application que nous développerons ici ne possède pas tous les éléments
     des interfaces dernier cri, elle va nous permettre d'utiliser les techniques de base
-    utilisées dans les applications plus complexes.
+    utilisées dans les applications plus complexes.
 
-    Lorsque vous aurez terminé ce tutoriel, nous vous recommandons de poursuivre avec l'exemple
-    "\l{mainwindows/application}{Application}", qui présente une interface simple utilisant
-    les menus et barres d'outils, la barre d'état, etc.
+    Lorsque vous aurez terminé ce tutoriel, nous vous recommandons de poursuivre avec l'exemple
+    "\l{mainwindows/application}{Application}", qui présente une interface simple utilisant
+    les menus et barres d'outils, la barre d'état, etc.
 
 */
 
@@ -98,156 +98,156 @@
     \example tutorials/addressbook-fr/part1
     \title Carnet d'adresses 1 - Conception de l'interface utilisateur
 
-    La première partie de ce tutoriel traite de la conception d'une interface graphique
+    La première partie de ce tutoriel traite de la conception d'une interface graphique
     (GUI) basique, que l'on utilisera pour l'application Carnet d'adresses.
 
-    La première étape dans la création d'applications graphiques est la conception de
-    l'interface utilisateur. Dans ce chapitre, nous verrons comment créer les labels
-    et champs de saisie nécessaires à l'implementation d'un carnet d'adresses de base.
-    Le résultat attendu est illustré par la capture d'écran ci-dessous.
+    La première étape dans la création d'applications graphiques est la conception de
+    l'interface utilisateur. Dans ce chapitre, nous verrons comment créer les labels
+    et champs de saisie nécessaires à l'implementation d'un carnet d'adresses de base.
+    Le résultat attendu est illustré par la capture d'écran ci-dessous.
 
     \image addressbook-tutorial-part1-screenshot.png
 
     Nous allons avoir besoin de deux objets QLabel, \c nameLabel et \c addressLabel,
     ainsi que deux champs de saisie: un objet QLineEdit, \c nameLine, et un objet
-    QTextEdit, \c addressText, afin de permettre à l'utilisateur d'entrer le nom d'un
-    contact et son adresse. Les widgets utilisés ainsi que leur placement sont visibles ci-dessous.
+    QTextEdit, \c addressText, afin de permettre à l'utilisateur d'entrer le nom d'un
+    contact et son adresse. Les widgets utilisés ainsi que leur placement sont visibles ci-dessous.
 
     \image addressbook-tutorial-part1-labeled-screenshot.png
 
-    Trois fichiers sont nécessaires à l'implémentation de ce carnet d'adresses:
+    Trois fichiers sont nécessaires à l'implémentation de ce carnet d'adresses:
 
     \list
-        \o \c{addressbook.h} - le fichier de définition (header) pour la classe \c AddressBook,
-        \o \c{addressbook.cpp} - le fichier source, qui comprend l'implémentation de la classe
+        \o \c{addressbook.h} - le fichier de définition (header) pour la classe \c AddressBook,
+        \o \c{addressbook.cpp} - le fichier source, qui comprend l'implémentation de la classe
             \c AddressBook
-        \o \c{main.cpp} - le fichier qui contient la méthode \c main() , et
+        \o \c{main.cpp} - le fichier qui contient la méthode \c main() , et
         une instance de la classe \c AddressBook.
     \endlist
 
-    \section1 Programmation en Qt - héritage
+    \section1 Programmation en Qt - héritage
 
 
-    Lorsque l'on écrit des programmes avec Qt, on a généralement recours à
-    l'héritage depuis des objets Qt, afin d'y ajouter des fonctionnalités.
-    C'est l'un des concepts fondamentaux de la création de widgets personnalisés
-    ou de collections de widgets. Utiliser l'héritage afin de compléter
-    ou modifier le comportement d'un widget présente les avantages suivants:
+    Lorsque l'on écrit des programmes avec Qt, on a généralement recours à
+    l'héritage depuis des objets Qt, afin d'y ajouter des fonctionnalités.
+    C'est l'un des concepts fondamentaux de la création de widgets personnalisés
+    ou de collections de widgets. Utiliser l'héritage afin de compléter
+    ou modifier le comportement d'un widget présente les avantages suivants:
 
     \list
-    \o La possibilité d'implémenter des méthodes virtuelles et des méthodes 
-    virtuelles pures pour obtenir exactement ce que l'on souhaite, avec la possibilité
-    d'utiliser l'implémentation de la classe mère si besoin est.
+    \o La possibilité d'implémenter des méthodes virtuelles et des méthodes 
+    virtuelles pures pour obtenir exactement ce que l'on souhaite, avec la possibilité
+    d'utiliser l'implémentation de la classe mère si besoin est.
     \o Cela permet l'encapsulation partielle de l'interface utilisateur dans une classe,
-    afin que les autres parties de l'application n'aient pas à se soucier de chacun des
+    afin que les autres parties de l'application n'aient pas à se soucier de chacun des
     widgets qui forment l'interface utilisateur.
-    \o La classe fille peut être utilisée pour créer de nombreux widgets personnalisés
-    dans une même application ou bibliothèque, et le code de la classe fille peut être
-    réutilisé dans d'autres projets
+    \o La classe fille peut être utilisée pour créer de nombreux widgets personnalisés
+    dans une même application ou bibliothèque, et le code de la classe fille peut être
+    réutilisé dans d'autres projets
     \endlist
 
     Comme Qt ne fournit pas de widget standard pour un carnet d'adresses, nous 
-    partirons d'une classe de widget Qt standard et y ajouterons des fonctionnalités.
-    La classe \c AddressBook crée dans ce tutoriel peut être réutilisée si on a besoin d'un
+    partirons d'une classe de widget Qt standard et y ajouterons des fonctionnalités.
+    La classe \c AddressBook crée dans ce tutoriel peut être réutilisée si on a besoin d'un
     widget carnet d'adresses basique.
 
 
     \section1 La classe AddressBook
 
     Le fichier \l{tutorials/addressbook-fr/part1/addressbook.h}{\c addressbook.h} permet de
-    définir la classe \c AddressBook.
+    définir la classe \c AddressBook.
 
-    On commence par définir \c AddressBook comme une classe fille de QWidget et déclarer
-    un constructeur. On utilise également la macro Q_OBJECT pour indiquer que la classe
-    exploite les fonctionnalités de signaux et slots offertes par Qt ainsi que
-    l'internationalisation, bien que nous ne les utilisions pas à ce stade.
+    On commence par définir \c AddressBook comme une classe fille de QWidget et déclarer
+    un constructeur. On utilise également la macro Q_OBJECT pour indiquer que la classe
+    exploite les fonctionnalités de signaux et slots offertes par Qt ainsi que
+    l'internationalisation, bien que nous ne les utilisions pas à ce stade.
 
     \snippet tutorials/addressbook-fr/part1/addressbook.h class definition
 
-    La classe contient les déclarations de \c nameLine et \c addressText,
-    les instances privées de QLineEdit et QTextEdit mentionnées précédemment.
-    Vous verrez, dans les chapitres à venir que les informations contenues
-    dans \c nameLine et \c addressText sont nécessaires à de nombreuses méthodes
+    La classe contient les déclarations de \c nameLine et \c addressText,
+    les instances privées de QLineEdit et QTextEdit mentionnées précédemment.
+    Vous verrez, dans les chapitres à venir que les informations contenues
+    dans \c nameLine et \c addressText sont nécessaires à de nombreuses méthodes
     du carnet d'adresses.
 
-    Il n'est pas nécessaire de déclarer les objets QLabel que nous allons utiliser 
-    puisque nous n'aurons pas besoin d'y faire référence après leur création.
-    La façon dont Qt gère la parenté des objets est traitée dans la section suivante.
+    Il n'est pas nécessaire de déclarer les objets QLabel que nous allons utiliser 
+    puisque nous n'aurons pas besoin d'y faire référence après leur création.
+    La façon dont Qt gère la parenté des objets est traitée dans la section suivante.
 
-    La macro Q_OBJECT implémente des fonctionnalités parmi les plus avancées de Qt.
+    La macro Q_OBJECT implémente des fonctionnalités parmi les plus avancées de Qt.
     Pour le moment, il est bon de voir la macro Q_OBJECT comme un raccourci nous 
-    permettant d'utiliser les méthodes \l{QObject::}{tr()} et \l{QObject::}{connect()}.
+    permettant d'utiliser les méthodes \l{QObject::}{tr()} et \l{QObject::}{connect()}.
 
-    Nous en avons maintenant terminé avec le fichier \c addressbook.h et allons
-    passer à l'implémentation du fichier \c addressbook.cpp.
+    Nous en avons maintenant terminé avec le fichier \c addressbook.h et allons
+    passer à l'implémentation du fichier \c addressbook.cpp.
 
-    \section1 Implémentation de la classe AddressBook
+    \section1 Implémentation de la classe AddressBook
 
-    Le constructeur de la classe \c{AddressBook} prend en paramètre un QWidget, \e parent.
-    Par convention, on passe ce paramètre au constructeur de la classe mère.
-    Ce concept de parenté, où un parent peut avoir un ou plusieurs enfants, est utile
-    pour regrouper les Widgets avec Qt. Par exemple, si vous détruisez le parent,
-    tous ses enfants seront détruits égalament.
+    Le constructeur de la classe \c{AddressBook} prend en paramètre un QWidget, \e parent.
+    Par convention, on passe ce paramètre au constructeur de la classe mère.
+    Ce concept de parenté, où un parent peut avoir un ou plusieurs enfants, est utile
+    pour regrouper les Widgets avec Qt. Par exemple, si vous détruisez le parent,
+    tous ses enfants seront détruits égalament.
 
 
     \snippet tutorials/addressbook/part1/addressbook.cpp constructor and input fields
 
-    à l'intérieur de ce constructeur, on déclare et instancie deux objets locaux
-    QLabel, \c nameLabel et \c addressLabel, de même on instancie \c nameLine et
-    \c addressText. La méthode \l{QObject::tr()}{tr()} renvoie une version traduite
-    de la chaîne de caractères, si elle existe; dans le cas contraire, elle renvoie
-    la chaîne elle même. On peut voir cette méthode comme un marqueur \tt{<insérer
-    la traduction ici>}, permettant de repérer les objets QString à considérer
-    pour traduire une application. Vous remarquerez, dans les chapitres à venir
-    comme dans les \l{Qt Examples}{exemples Qt}, qu'elle est utilisée chaque fois
-    que l'on utilise une chaîne susceptible d'être traduite.
+    à l'intérieur de ce constructeur, on déclare et instancie deux objets locaux
+    QLabel, \c nameLabel et \c addressLabel, de même on instancie \c nameLine et
+    \c addressText. La méthode \l{QObject::tr()}{tr()} renvoie une version traduite
+    de la chaîne de caractères, si elle existe; dans le cas contraire, elle renvoie
+    la chaîne elle même. On peut voir cette méthode comme un marqueur \tt{<insérer
+    la traduction ici>}, permettant de repérer les objets QString à considérer
+    pour traduire une application. Vous remarquerez, dans les chapitres à venir
+    comme dans les \l{Qt Examples}{exemples Qt}, qu'elle est utilisée chaque fois
+    que l'on utilise une chaîne susceptible d'être traduite.
 
     Lorsque l'on programme avec Qt, il est utile de savoir comment fonctionnent les
     agencements ou layouts. Qt fournit trois classes principales de layouts pour
-    contrôler le placement des widgets: QHBoxLayout, QVBoxLayout et QGridLayout.
+    contrôler le placement des widgets: QHBoxLayout, QVBoxLayout et QGridLayout.
 
     \image addressbook-tutorial-part1-labeled-layout.png
 
-    On utilise un QGridLayout pour positionner nos labels et champs de saisie de manière
-    structurée. QGridLayout divise l'espace disponible en une grille, et place les
-    widgets dans les cellules que l'on spécifie par les numéros de ligne et de colonne.
-    Le diagramme ci-dessus présente les cellules et la position des widgets, et cette
-    organisation est obtenue à l'aide du code suivant:
+    On utilise un QGridLayout pour positionner nos labels et champs de saisie de manière
+    structurée. QGridLayout divise l'espace disponible en une grille, et place les
+    widgets dans les cellules que l'on spécifie par les numéros de ligne et de colonne.
+    Le diagramme ci-dessus présente les cellules et la position des widgets, et cette
+    organisation est obtenue à l'aide du code suivant:
 
     \snippet tutorials/addressbook/part1/addressbook.cpp layout
 
-    On remarque que le label \c AddressLabel est positionné en utilisant Qt::AlignTop
-    comme argument optionnel. Ceci est destiné à assurer qu'il ne sera pas centré
-    verticalement dans la cellule (1,0). Pour un aperçu rapide des layouts de Qt,
+    On remarque que le label \c AddressLabel est positionné en utilisant Qt::AlignTop
+    comme argument optionnel. Ceci est destiné à assurer qu'il ne sera pas centré
+    verticalement dans la cellule (1,0). Pour un aperçu rapide des layouts de Qt,
     consultez la section \l{Layout Management}.
 
-    Afin d'installer l'objet layout dans un widget, il faut appeler la méthode
+    Afin d'installer l'objet layout dans un widget, il faut appeler la méthode
     \l{QWidget::setLayout()}{setLayout()} du widget en question:
 
     \snippet tutorials/addressbook/part1/addressbook.cpp setting the layout
 
-    Enfin, on initialise le titre du widget à "Simple Address Book"
+    Enfin, on initialise le titre du widget à "Simple Address Book"
 
-    \section1 Exécution de l'application
+    \section1 Exécution de l'application
 
-    Un fichier séparé, \c main.cpp, est utilisé pour la méthode \c main(). Dans cette
-    fonction, on crée une instance de QApplication, \c app. QApplication se charge de
-    des ressources communes à l'ensemble de l'application, tel que les polices de
-    caractères et le curseur par défaut, ainsi que de l'exécution de la boucle d'évènements.
+    Un fichier séparé, \c main.cpp, est utilisé pour la méthode \c main(). Dans cette
+    fonction, on crée une instance de QApplication, \c app. QApplication se charge de
+    des ressources communes à l'ensemble de l'application, tel que les polices de
+    caractères et le curseur par défaut, ainsi que de l'exécution de la boucle d'évènements.
     De ce fait, il y a toujours un objet QApplication dans toute application graphique en Qt.
 
     \snippet tutorials/addressbook/part1/main.cpp main function
 
     On construit un nouveau widget \c AddressBook sur la pile et on invoque
-    sa méthode \l{QWidget::show()}{show()} pour l'afficher.
-    Cependant, le widget ne sera pas visible tant que la boucle d'évènements
-    n'aura pas été lancée. On démarre la boucle d'évènements en appelant la
-    méthode \l{QApplication::}{exec()} de l'application; le résultat renvoyé
-    par cette méthode est lui même utilisé comme valeur de retour pour la méthode
+    sa méthode \l{QWidget::show()}{show()} pour l'afficher.
+    Cependant, le widget ne sera pas visible tant que la boucle d'évènements
+    n'aura pas été lancée. On démarre la boucle d'évènements en appelant la
+    méthode \l{QApplication::}{exec()} de l'application; le résultat renvoyé
+    par cette méthode est lui même utilisé comme valeur de retour pour la méthode
     \c main().
-    On comprend maintenant pourquoi \c AddressBook a été créé sur la pile: à la fin
+    On comprend maintenant pourquoi \c AddressBook a été créé sur la pile: à la fin
     du programme, l'objet sort du scope de la fonction \c main() et tous ses widgets enfants
-    sont supprimés, assurant ainsi qu'il n'y aura pas de fuites de mémoire.
+    sont supprimés, assurant ainsi qu'il n'y aura pas de fuites de mémoire.
 */
 
 /*!
@@ -258,53 +258,53 @@
     \example tutorials/addressbook-fr/part2
     \title Carnet d'adresses 2 - Ajouter des adresses
 
-    La prochaine étape pour créer notre carnet d'adresses est d'ajouter un soupçon
-    d'interactivité.
+    La prochaine étape pour créer notre carnet d'adresses est d'ajouter un soupçon
+    d'interactivité.
 
     \image addressbook-tutorial-part2-add-contact.png
 
     Nous allons fournir un bouton que l'utilisateur peut
-    cliquer pour ajouter un nouveau contact. Une structure de données est aussi
-    nécessaire afin de pouvoir stocker les contacts en mémoire.
+    cliquer pour ajouter un nouveau contact. Une structure de données est aussi
+    nécessaire afin de pouvoir stocker les contacts en mémoire.
 
-    \section1 Définition de la classe AddressBook
+    \section1 Définition de la classe AddressBook
 
     Maintenant que nous avons mis en place les labels et les champs de saisie,
-    nous ajoutons les boutons pour compléter le processus d'ajout d'un contact.
+    nous ajoutons les boutons pour compléter le processus d'ajout d'un contact.
     Cela veut dire que notre fichier \c addressbook.h a maintenant trois
     objets QPushButton et trois slots publics correspondant.
 
     \snippet tutorials/addressbook/part2/addressbook.h slots
 
-    Un slot est une méthode qui répond à un signal. Nous allons
-    voir ce concept en détail lorsque nous implémenterons la classe \c{AddressBook}.
-    Pour une explication détaillée du concept de signal et slot, vous pouvez
-    vous référer au document \l{Signals and Slots}.
+    Un slot est une méthode qui répond à un signal. Nous allons
+    voir ce concept en détail lorsque nous implémenterons la classe \c{AddressBook}.
+    Pour une explication détaillée du concept de signal et slot, vous pouvez
+    vous référer au document \l{Signals and Slots}.
 
     Les trois objets QPushButton \c addButton, \c submitButton et \c cancelButton
-    sont maintenant inclus dans la déclaration des variables privées, avec
-    \c nameLine et \c addressText du chapitre précédent.
+    sont maintenant inclus dans la déclaration des variables privées, avec
+    \c nameLine et \c addressText du chapitre précédent.
 
     \snippet tutorials/addressbook/part2/addressbook.h pushbutton declaration
 
     Nous avons besoin d'un conteneur pour stocker les contacts du carnet
-    d'adresses, de façon à pouvoir les énumérer et les afficher.
-    Un objet QMap, \c contacts, est utilisé pour ça, car il permet de stocker
-    des paires clé-valeur: le nom du contact est la \e{clé} et l'adresse du contact
+    d'adresses, de façon à pouvoir les énumérer et les afficher.
+    Un objet QMap, \c contacts, est utilisé pour ça, car il permet de stocker
+    des paires clé-valeur: le nom du contact est la \e{clé} et l'adresse du contact
     est la \e{valeur}.
 
     \snippet tutorials/addressbook/part2/addressbook.h remaining private variables
 
-    Nous déclarons aussi deux objects QString privés: \c oldName et \c oldAddress.
-    Ces objets sont nécessaires pour conserver le nom et l'adresse du dernier contact
-    affiché avant que l'utilisateur ne clique sur le bouton "Add". Grâce à ces variables
+    Nous déclarons aussi deux objects QString privés: \c oldName et \c oldAddress.
+    Ces objets sont nécessaires pour conserver le nom et l'adresse du dernier contact
+    affiché avant que l'utilisateur ne clique sur le bouton "Add". Grâce à ces variables
     si l'utilisateur clique sur "Cancel", il est possible de revenir
-    à l'affichage du dernier contact.
+    à l'affichage du dernier contact.
 
-    \section1 Implémentation de la classe AddressBook
+    \section1 Implémentation de la classe AddressBook
 
     Dans le constructeur de \c AddressBook, \c nameLine et
-    \c addressText sont mis en mode lecture seule, de façon à autoriser l'affichage
+    \c addressText sont mis en mode lecture seule, de façon à autoriser l'affichage
     mais pas la modification du contact courant.
 
     \dots
@@ -317,16 +317,16 @@
 
     \snippet tutorials/addressbook/part2/addressbook.cpp pushbutton declaration
 
-    Le bouton \c addButton est affiché en invoquant la méthode \l{QPushButton::show()}
-    {show()}, tandis que \c submitButton et \c cancelButton sont cachés en invoquant
-    \l{QPushButton::hide()}{hide()}. Ces deux boutons ne seront affichés que lorsque 
-    l'utilisateur cliquera sur "Add", et ceci est géré par la méthode \c addContact()
-    décrite plus loin.
+    Le bouton \c addButton est affiché en invoquant la méthode \l{QPushButton::show()}
+    {show()}, tandis que \c submitButton et \c cancelButton sont cachés en invoquant
+    \l{QPushButton::hide()}{hide()}. Ces deux boutons ne seront affichés que lorsque 
+    l'utilisateur cliquera sur "Add", et ceci est géré par la méthode \c addContact()
+    décrite plus loin.
 
     \snippet tutorials/addressbook/part2/addressbook.cpp connecting signals and slots
 
     Nous connectons le signal \l{QPushButton::clicked()}{clicked()} de chaque bouton 
-    au slot qui gèrera l'action.
+    au slot qui gèrera l'action.
     L'image ci-dessous illustre ceci:
 
     \image addressbook-tutorial-part2-signals-and-slots.png
@@ -336,77 +336,77 @@
 
     \snippet tutorials/addressbook/part2/addressbook.cpp vertical layout
 
-    La methode \l{QBoxLayout::addStretch()}{addStretch()} est utilisée pour
-    assurer que les boutons ne sont pas répartis uniformément, mais regroupés
-    dans la partie supperieure du widget. La figure ci-dessous montre la différence
-    si \l{QBoxLayout::addStretch()}{addStretch()} est utilisé ou pas.
+    La methode \l{QBoxLayout::addStretch()}{addStretch()} est utilisée pour
+    assurer que les boutons ne sont pas répartis uniformément, mais regroupés
+    dans la partie supperieure du widget. La figure ci-dessous montre la différence
+    si \l{QBoxLayout::addStretch()}{addStretch()} est utilisé ou pas.
 
     \image addressbook-tutorial-part2-stretch-effects.png
 
-    Ensuite nous ajoutons \c buttonLayout1 à \c mainLayout, en utilisant
+    Ensuite nous ajoutons \c buttonLayout1 à \c mainLayout, en utilisant
     \l{QGridLayout::addLayout()}{addLayout()}. Ceci nous permet d'imbriquer les
     mises en page puisque \c buttonLayout1 est maintenant un enfant de \c mainLayout.
 
     \snippet tutorials/addressbook/part2/addressbook.cpp grid layout
 
-    Les coordonnées du layout global ressemblent maintenant à ça:
+    Les coordonnées du layout global ressemblent maintenant à ça:
 
     \image addressbook-tutorial-part2-labeled-layout.png
 
-    Dans la méthode \c addContact(), nous stockons les détails du dernier
-    contact affiché dans \c oldName et \c oldAddress. Ensuite, nous
-    vidons ces champs de saisie et nous désactivons le mode
-    lecture seule. Le focus est placé sur \c nameLine et on affiche
+    Dans la méthode \c addContact(), nous stockons les détails du dernier
+    contact affiché dans \c oldName et \c oldAddress. Ensuite, nous
+    vidons ces champs de saisie et nous désactivons le mode
+    lecture seule. Le focus est placé sur \c nameLine et on affiche
     \c submitButton et \c cancelButton.
 
     \snippet tutorials/addressbook/part2/addressbook.cpp addContact
 
-    La méthode \c submitContact() peut être divisée en trois parties:
+    La méthode \c submitContact() peut être divisée en trois parties:
 
     \list 1
-    \o Nous extrayons les détails du contact depuis \c nameLine et \c addressText
+    \o Nous extrayons les détails du contact depuis \c nameLine et \c addressText
     et les stockons dans des objets QString. Nous les validons pour s'assurer
-    que l'utilisateur n'a pas cliqué sur "Add" avec des champs de saisie
-    vides; sinon un message est affiché avec QMessageBox pour rappeller à
-    l'utilisateur que les deux champs doivent être complétés.
+    que l'utilisateur n'a pas cliqué sur "Add" avec des champs de saisie
+    vides; sinon un message est affiché avec QMessageBox pour rappeller à
+    l'utilisateur que les deux champs doivent être complétés.
 
     \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part1
 
-    \o Ensuite, nous vérifions si le contact existe déjà. Si aucun contacts
-    existant n'entre en conflit avec le nouveau, nous l'ajoutons à
+    \o Ensuite, nous vérifions si le contact existe déjà. Si aucun contacts
+    existant n'entre en conflit avec le nouveau, nous l'ajoutons à
     \c contacts et nous affichons un QMessageBox pour informer l'utilisateur
-    que le contact a été ajouté.
+    que le contact a été ajouté.
 
     \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part2
 
-    Si le contact existe déjà, nous affichons un QMessageBox pour informer
-    l'utilisateur du problème.
-    Notre objet \c contacts est basé sur des paires clé-valeur formés par
-    le nom et l'adresse, nous voulons nous assurer que la \e clé est unique.
+    Si le contact existe déjà, nous affichons un QMessageBox pour informer
+    l'utilisateur du problème.
+    Notre objet \c contacts est basé sur des paires clé-valeur formés par
+    le nom et l'adresse, nous voulons nous assurer que la \e clé est unique.
 
-    \o Une fois que les deux vérifications précédentes ont été traitées,
-    nous restaurons les boutons à leur état normal à l'aide du code
+    \o Une fois que les deux vérifications précédentes ont été traitées,
+    nous restaurons les boutons à leur état normal à l'aide du code
     suivant:
 
     \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part3
 
     \endlist
 
-    La capture d'écran ci-dessous montre l'affichage fournit par un objet
-    QMessageBox, utilisé ici pour afficher un message d'information
-    à l'utilisateur:
+    La capture d'écran ci-dessous montre l'affichage fournit par un objet
+    QMessageBox, utilisé ici pour afficher un message d'information
+    à l'utilisateur:
 
     \image addressbook-tutorial-part2-add-successful.png
 
-    La méthode \c cancel() restaure les détails du dernier contact, active
+    La méthode \c cancel() restaure les détails du dernier contact, active
     \c addButton, et cache \c submitButton et \c cancelButton.
 
     \snippet tutorials/addressbook/part2/addressbook.cpp cancel
 
-    L'idée générale pour augmenter la flexibilité lors de l'ajout d'un 
-    contact est de donner la possiblité de cliquer sur "Add" 
-    ou "Cancel" à n'importe quel moment.
-    L'organigramme ci-dessous reprend l'ensemble des interactions dévelopées
+    L'idée générale pour augmenter la flexibilité lors de l'ajout d'un 
+    contact est de donner la possiblité de cliquer sur "Add" 
+    ou "Cancel" à n'importe quel moment.
+    L'organigramme ci-dessous reprend l'ensemble des interactions dévelopées
     jusqu'ici:
 
     \image addressbook-tutorial-part2-add-flowchart.png
@@ -418,118 +418,118 @@
     \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
     \nextpage {tutorials/addressbook-fr/part4}{Chapitre 4}
     \example tutorials/addressbook-fr/part3
-    \title Carnet d'adresses 3 - Navigation entre les éléments
+    \title Carnet d'adresses 3 - Navigation entre les éléments
 
-    L'application "Carnet d'adresses" est maintenant à moitié terminée. Il
+    L'application "Carnet d'adresses" est maintenant à moitié terminée. Il
     nous faut maintenant ajouter quelques fonctions pour naviguer entre
-    les contacts. Avant de commencer, il faut se décider sur le type de structure de
-    données le plus approprié pour stocker les contacts.
+    les contacts. Avant de commencer, il faut se décider sur le type de structure de
+    données le plus approprié pour stocker les contacts.
 
-    Dans le chapitre 2, nous avons utilisé un QMap utilisant des paires clé-valeur,
-    avec le nom du contact comme \e clé, et l'adresse du contact comme \e valeur.
+    Dans le chapitre 2, nous avons utilisé un QMap utilisant des paires clé-valeur,
+    avec le nom du contact comme \e clé, et l'adresse du contact comme \e valeur.
     Cela fonctionnait bien jusqu'ici, mais pour ajouter la navigation entre les
-    entrées, quelques améliorations sont nécessaires.
+    entrées, quelques améliorations sont nécessaires.
 
-    Nous améliorerons le QMap en le faisant ressembler à une structure de données
-    similaire à une liste liée, où tous les éléments sont connectés, y compris
-    le premier et le dernier élément. La figure ci-dessous illustre cette structure
-    de donnée.
+    Nous améliorerons le QMap en le faisant ressembler à une structure de données
+    similaire à une liste liée, où tous les éléments sont connectés, y compris
+    le premier et le dernier élément. La figure ci-dessous illustre cette structure
+    de donnée.
 
     \image addressbook-tutorial-part3-linkedlist.png
 
-    \section1 Définition de la classe AddressBook
+    \section1 Définition de la classe AddressBook
 
     Pour ajouter les fonctions de navigation au carnet d'adresses, nous avons
-    besoin de deux slots supplémentaires dans notre classe \c AddressBook:
-    \c next() et \c previous(). Ceux-ci sont ajoutés au fichier addressbook.h:
+    besoin de deux slots supplémentaires dans notre classe \c AddressBook:
+    \c next() et \c previous(). Ceux-ci sont ajoutés au fichier addressbook.h:
 
     \snippet tutorials/addressbook/part3/addressbook.h navigation functions
 
     Nous avons aussi besoin de deux nouveaux objets QPushButton, nous ajoutons
-    donc les variables privées \c nextButton et \c previousButton.
+    donc les variables privées \c nextButton et \c previousButton.
 
     \snippet tutorials/addressbook/part3/addressbook.h navigation pushbuttons
 
-    \section1 Implémentation de la classe AddressBook
+    \section1 Implémentation de la classe AddressBook
 
-    A l'intérieur du constructeur de \c AddressBook, dans \c addressbook.cpp, nous
-    instancions \c nextButton et \c previousButton et nous les désactivons
-    par défaut. Nous faisons ceci car la navigation ne doit être activée
+    A l'intérieur du constructeur de \c AddressBook, dans \c addressbook.cpp, nous
+    instancions \c nextButton et \c previousButton et nous les désactivons
+    par défaut. Nous faisons ceci car la navigation ne doit être activée
     que lorsqu'il y a plus d'un contact dans le carnet d'adresses.
 
     \snippet tutorials/addressbook/part3/addressbook.cpp navigation pushbuttons
 
-    Nous connectons alors ces boutons à leur slots respectifs:
+    Nous connectons alors ces boutons à leur slots respectifs:
 
     \snippet tutorials/addressbook/part3/addressbook.cpp connecting navigation signals
 
-    L'image ci-dessous montre l'interface utilisateur que nous allons créer.
-    Remarquez que cela ressemble de plus en plus à l'interface du programme
+    L'image ci-dessous montre l'interface utilisateur que nous allons créer.
+    Remarquez que cela ressemble de plus en plus à l'interface du programme
     complet.
 
     \image addressbook-tutorial-part3-screenshot.png
 
     Nous suivons les conventions pour les fonctions \c next() et \c previous()
-    en plaçant \c nextButton à droite et \c previousButton à gauche. Pour
+    en plaçant \c nextButton à droite et \c previousButton à gauche. Pour
     faire cette mise en page intuitive, nous utilisons un QHBoxLayout pour
-    placer les widgets côte à côte:
+    placer les widgets côte à côte:
 
     \snippet tutorials/addressbook/part3/addressbook.cpp navigation layout
 
-    L'objet QHBoxLayout, \c buttonLayout2, est ensuite ajouté à \c mainLayout.
+    L'objet QHBoxLayout, \c buttonLayout2, est ensuite ajouté à \c mainLayout.
 
     \snippet tutorials/addressbook/part3/addressbook.cpp adding navigation layout
 
-    La figure ci-dessous montre les systèmes de coordonnées pour les widgets du
+    La figure ci-dessous montre les systèmes de coordonnées pour les widgets du
     \c mainLayout.
     \image addressbook-tutorial-part3-labeled-layout.png
 
-    Dans notre méthode \c addContact(), nous avons desactivé ces boutons 
-    pour être sûr que l'utilisateur n'utilise pas la navigation lors de 
+    Dans notre méthode \c addContact(), nous avons desactivé ces boutons 
+    pour être sûr que l'utilisateur n'utilise pas la navigation lors de 
     l'ajout d'un contact.
 
     \snippet tutorials/addressbook/part3/addressbook.cpp disabling navigation
 
-    Dans notre méthode \c submitContact(), nous activons les boutons de
+    Dans notre méthode \c submitContact(), nous activons les boutons de
     navigation, \c nextButton et \c previousButton, en fonction de la
-    taille de \c contacts. Commen mentionné plus tôt, la navigation n'est 
-    activée que si il y a plus d'un contact dans le carnet d'adresses.
+    taille de \c contacts. Commen mentionné plus tôt, la navigation n'est 
+    activée que si il y a plus d'un contact dans le carnet d'adresses.
     Les lignes suivantes montrent comment faire cela:
 
     \snippet tutorials/addressbook/part3/addressbook.cpp enabling navigation
 
     Nous incluons aussi ces lignes de code dans le bouton \c cancel().
 
-    Souvenez vous que nous voulons émuler une liste-liée ciruculaire à
-    l'aide de l'objet QMap, \c contacts. Pour faire cela, nous obtenons un itérateur 
-    sur \c contact dans la méthode \c next(), et ensuite:
+    Souvenez vous que nous voulons émuler une liste-liée ciruculaire à
+    l'aide de l'objet QMap, \c contacts. Pour faire cela, nous obtenons un itérateur 
+    sur \c contact dans la méthode \c next(), et ensuite:
 
     \list
-        \o Si l'itérateur n'est pas à la fin de \c contacts, nous l'incrémentons
-        \o Si l'itérateur est à la fin de \c contacts, nous changeons sa position
-        jusqu'au début de \c contacts. Cela donne l'illusion que notre QMap 
+        \o Si l'itérateur n'est pas à la fin de \c contacts, nous l'incrémentons
+        \o Si l'itérateur est à la fin de \c contacts, nous changeons sa position
+        jusqu'au début de \c contacts. Cela donne l'illusion que notre QMap 
         fonctionne comme une liste circulaire.
     \endlist
 
     \snippet tutorials/addressbook/part3/addressbook.cpp next() function
 
-    Une fois que nous avons itéré jusqu'à l'objet recherché dans \c contacts,
+    Une fois que nous avons itéré jusqu'à l'objet recherché dans \c contacts,
     nous affichons son contenu sur \c nameLine et \c addressText.
 
-    De la même façon, pour la méthode \c previous(), nous obtenons un 
-    itérateur sur \c contacts et ensuite:
+    De la même façon, pour la méthode \c previous(), nous obtenons un 
+    itérateur sur \c contacts et ensuite:
 
     \list
-        \o Si l'itérateur est à la fin de \c contacts, on réinitialise
+        \o Si l'itérateur est à la fin de \c contacts, on réinitialise
            l'affichage et on retourne.
-        \o Si l'itérateur est au début de \c contacts, on change sa 
-           position jusqu'à la fin
-        \o Ensuite, on décrémente l'itérateur
+        \o Si l'itérateur est au début de \c contacts, on change sa 
+           position jusqu'à la fin
+        \o Ensuite, on décrémente l'itérateur
     \endlist
 
     \snippet tutorials/addressbook/part3/addressbook.cpp previous() function
 
-    à nouveau, nous affichons le contenu de l'objet courant dans \c contacts.
+    à nouveau, nous affichons le contenu de l'objet courant dans \c contacts.
 
 */
 
@@ -540,27 +540,27 @@
     \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
     \nextpage {tutorials/addressbook-fr/part5}{Chapitre 5}
     \example tutorials/addressbook-fr/part4
-    \title Carnet d'Adresses 4 - éditer et supprimer des adresses
+    \title Carnet d'Adresses 4 - éditer et supprimer des adresses
 
 
-    Dans ce chapitre, nous verrons comment modifier les données des contacts
+    Dans ce chapitre, nous verrons comment modifier les données des contacts
     contenus dans l'application carnet d'adresses.
 
 
     \image addressbook-tutorial-screenshot.png
 
     Nous avons maintenant un carnet d'adresses qui ne se contente pas de
-    lister des contacts de façon ordonnée, mais permet également la 
-    navigation. Il serait pratique d'inclure des fonctions telles qu'éditer et
-    supprimer, afin que les détails associés à un contact puissent être
-    modifiés lorsque c'est nécessaire. Cependant, cela requiert une légère
-    modification, sous la forme d'énumérations. Au chapitre précédent, nous avions deux
-    modes: \c {AddingMode} et \c {NavigationMode}, mais ils n'étaient pas
-    définis en tant qu'énumérations. Au lieu de ça, on activait et désactivait les
+    lister des contacts de façon ordonnée, mais permet également la 
+    navigation. Il serait pratique d'inclure des fonctions telles qu'éditer et
+    supprimer, afin que les détails associés à un contact puissent être
+    modifiés lorsque c'est nécessaire. Cependant, cela requiert une légère
+    modification, sous la forme d'énumérations. Au chapitre précédent, nous avions deux
+    modes: \c {AddingMode} et \c {NavigationMode}, mais ils n'étaient pas
+    définis en tant qu'énumérations. Au lieu de ça, on activait et désactivait les
     boutons correspondants manuellement, au prix de multiples redondances dans
     le code.
 
-    Dans ce chapitre, on définit l'énumération \c Mode avec trois valeurs possibles.
+    Dans ce chapitre, on définit l'énumération \c Mode avec trois valeurs possibles.
 
     \list
         \o \c{NavigationMode},
@@ -568,22 +568,22 @@
         \o \c{EditingMode}.
     \endlist
 
-    \section1 Définition de la classe AddressBook
+    \section1 Définition de la classe AddressBook
 
-    Le fichier \c addressbook.h est mis a jour pour contenir l'énumération \c Mode :
+    Le fichier \c addressbook.h est mis a jour pour contenir l'énumération \c Mode :
 
     \snippet tutorials/addressbook/part4/addressbook.h Mode enum
 
-    On ajoute également deux nouveaux slots, \c editContact() et
-    \c removeContact(), à notre liste de slots publics.
+    On ajoute également deux nouveaux slots, \c editContact() et
+    \c removeContact(), à notre liste de slots publics.
 
     \snippet tutorials/addressbook/part4/addressbook.h edit and remove slots
 
-    Afin de basculer d'un mode à l'autre, on introduit la méthode
-    \c updateInterface() pour contrôller l'activation et la désactivation de
-    tous les objets QPushButton. On ajoute également deux nouveaux boutons,
-    \c editButton et \c removeButton, pour les fonctions d'édition
-    et de suppression mentionnées plus haut.
+    Afin de basculer d'un mode à l'autre, on introduit la méthode
+    \c updateInterface() pour contrôller l'activation et la désactivation de
+    tous les objets QPushButton. On ajoute également deux nouveaux boutons,
+    \c editButton et \c removeButton, pour les fonctions d'édition
+    et de suppression mentionnées plus haut.
 
     \snippet tutorials/addressbook/part4/addressbook.h updateInterface() declaration
     \dots
@@ -591,97 +591,97 @@
     \dots
     \snippet tutorials/addressbook/part4/addressbook.h mode declaration
 
-    Enfin, on déclare \c currentMode pour garder une trace du mode 
-    actuellement utilisé.
+    Enfin, on déclare \c currentMode pour garder une trace du mode 
+    actuellement utilisé.
 
-    \section1 Implémentation de la classe AddressBook
+    \section1 Implémentation de la classe AddressBook
 
-    Il nous faut maintenant implémenter les fonctionnalités de changement de
+    Il nous faut maintenant implémenter les fonctionnalités de changement de
     mode de l'application carnet d'adresses. Les boutons \c editButton et
-    \c removeButton sont instanciés et désactivés par défaut, puisque le
-    carnet d'adresses démarre sans aucun contact en mémoire.
+    \c removeButton sont instanciés et désactivés par défaut, puisque le
+    carnet d'adresses démarre sans aucun contact en mémoire.
 
     \snippet tutorials/addressbook/part4/addressbook.cpp edit and remove buttons
 
-    Ces boutons sont ensuite connectés à leurs slots respectifs,
-    \c editContact() et \c removeContact(), avant d'être ajoutés à
+    Ces boutons sont ensuite connectés à leurs slots respectifs,
+    \c editContact() et \c removeContact(), avant d'être ajoutés à
     \c buttonLayout1.
 
     \snippet tutorials/addressbook/part4/addressbook.cpp connecting edit and remove
     \dots
     \snippet tutorials/addressbook/part4/addressbook.cpp adding edit and remove to the layout
 
-    La methode \c editContact() place les anciens détails du contact dans
+    La methode \c editContact() place les anciens détails du contact dans
     \c oldName et \c oldAddress, avant de basculer vers le mode
     \c EditingMode. Dans ce mode, les boutons \c submitButton et
-    \c cancelButton sont tous deux activés, l'utilisateur peut par conséquent
-    modifier les détails du contact et cliquer sur l'un de ces deux boutons
+    \c cancelButton sont tous deux activés, l'utilisateur peut par conséquent
+    modifier les détails du contact et cliquer sur l'un de ces deux boutons
     par la suite.
 
     \snippet tutorials/addressbook/part4/addressbook.cpp editContact() function
 
-    La méthode \c submitContact() a été divisée en deux avec un bloc
+    La méthode \c submitContact() a été divisée en deux avec un bloc
     \c{if-else}. On teste \c currentMode pour voir si le mode courant est
-    \c AddingMode. Si c'est le cas, on procède à l'ajout.
+    \c AddingMode. Si c'est le cas, on procède à l'ajout.
 
     \snippet tutorials/addressbook/part4/addressbook.cpp submitContact() function beginning
     \dots
     \snippet tutorials/addressbook/part4/addressbook.cpp submitContact() function part1
 
     Sinon, on s'assure que \c currentMode est en \c EditingMode. Si c'est le
-    cas, on compare \c oldName et \c name. Si le nom a changé, on supprime
-    l'ancien contact de \c contacts et on insère le contact mis a jour.
+    cas, on compare \c oldName et \c name. Si le nom a changé, on supprime
+    l'ancien contact de \c contacts et on insère le contact mis a jour.
 
     \snippet tutorials/addressbook/part4/addressbook.cpp submitContact() function part2
 
-    Si seule l'adresse a changé (i.e. \c oldAddress n'est pas identique à
-    \c address), on met à jour l'adresse du contact. Enfin on règle
-    \c currentMode à \c NavigationMode. C'est une étape importante puisque
-    c'est cela qui réactive tous les boutons désactivés.
+    Si seule l'adresse a changé (i.e. \c oldAddress n'est pas identique à
+    \c address), on met à jour l'adresse du contact. Enfin on règle
+    \c currentMode à \c NavigationMode. C'est une étape importante puisque
+    c'est cela qui réactive tous les boutons désactivés.
 
-    Afin de retirer un contact du carnet d'adresses, on implémente la méthode
-    \c removeContact(). Cette méthode vérifie que le contact est présent dans
+    Afin de retirer un contact du carnet d'adresses, on implémente la méthode
+    \c removeContact(). Cette méthode vérifie que le contact est présent dans
     \c contacts.
 
     \snippet tutorials/addressbook/part4/addressbook.cpp removeContact() function
 
-    Si c'est le cas, on affiche une boîte de dialogue QMessageBox, demandant
-    confirmation de la suppression à l'utilisateur. Une fois la confirmation
-    effectuée, on appelle \c previous(), afin de s'assurer que l'interface
-    utilisateur affiche une autre entrée, et on supprime le contact en
-    utilisant le méthode \l{QMap::remove()}{remove()} de \l{QMap}. Dans un
+    Si c'est le cas, on affiche une boîte de dialogue QMessageBox, demandant
+    confirmation de la suppression à l'utilisateur. Une fois la confirmation
+    effectuée, on appelle \c previous(), afin de s'assurer que l'interface
+    utilisateur affiche une autre entrée, et on supprime le contact en
+    utilisant le méthode \l{QMap::remove()}{remove()} de \l{QMap}. Dans un
     souci pratique, on informe l'utilisateur de la suppression par le biais
-    d'une autre QMessageBox. Les deux boîtes de dialogue utilisées dans cette
-    méthode sont représentées ci-dessous.
+    d'une autre QMessageBox. Les deux boîtes de dialogue utilisées dans cette
+    méthode sont représentées ci-dessous.
 
     \image addressbook-tutorial-part4-remove.png
 
-    \section2 Mise à jour de l'Interface utilisateur
+    \section2 Mise à jour de l'Interface utilisateur
 
-    On a évoqué plus haut la méthode \c updateInterface() comme moyen
-    d'activer et de désactiver les différents boutons de l'interface en
-    fonction du mode. Cette méthode met à jour le mode courant selon
-    l'argument \c mode qui lui est passé, en l'assignant à \c currentMode,
+    On a évoqué plus haut la méthode \c updateInterface() comme moyen
+    d'activer et de désactiver les différents boutons de l'interface en
+    fonction du mode. Cette méthode met à jour le mode courant selon
+    l'argument \c mode qui lui est passé, en l'assignant à \c currentMode,
     avant de tester sa valeur.
 
-    Chacun des boutons est ensuite activé ou désactivé, en fonction du mode.
+    Chacun des boutons est ensuite activé ou désactivé, en fonction du mode.
     Le code source pour les cas \c AddingMode et \c EditingMode est visible 
     ci-dessous:
 
     \snippet tutorials/addressbook/part4/addressbook.cpp update interface() part 1
 
     Dans le cas de \c NavigationMode, en revanche, des tests conditionnels
-    sont passés en paramètre de QPushButton::setEnabled(). Ceci permet de
-    s'assurer que les boutons \c editButton et \c removeButton ne sont activés
+    sont passés en paramètre de QPushButton::setEnabled(). Ceci permet de
+    s'assurer que les boutons \c editButton et \c removeButton ne sont activés
     que s'il existe au moins un contact dans le carnet d'adresses;
-    \c nextButton et \c previousButton ne sont activés que lorsqu'il existe
+    \c nextButton et \c previousButton ne sont activés que lorsqu'il existe
     plus d'un contact dans le carnet d'adresses.
 
     \snippet tutorials/addressbook/part4/addressbook.cpp update interface() part 2
 
-    En effectuant les opérations de réglage du mode et de mise à jour de
-    l'interface utilisateur au sein de la même méthode, on est à l'abri de
-    l'éventualité où l'interface utilisateur se "désynchronise" de l'état
+    En effectuant les opérations de réglage du mode et de mise à jour de
+    l'interface utilisateur au sein de la même méthode, on est à l'abri de
+    l'éventualité où l'interface utilisateur se "désynchronise" de l'état
     interne de l'application.
 
 */
@@ -694,7 +694,7 @@
     \example tutorials/addressbook-fr/part5
     \title Carnet d'adresse 5 - Ajout d'une fonction de recherche
 
-    Dans ce chapitre, nous allons voir les possibilités pour rechercher
+    Dans ce chapitre, nous allons voir les possibilités pour rechercher
     des contacts dans le carnet d'adresse.
 
     \image addressbook-tutorial-part5-screenshot.png
@@ -703,110 +703,110 @@
     il devient difficile de naviguer avec les boutons \e Next et \e Previous.
     Dans ce cas, une fonction de recherche serait plus efficace pour rechercher
     les contacts.
-    La capture d'écran ci-dessus montre le bouton de recherche \e Find et sa position
+    La capture d'écran ci-dessus montre le bouton de recherche \e Find et sa position
     dans le paneau de bouton.
 
     Lorsque l'utilisateur clique sur le bouton \e Find, il est courant d'afficher
-    une boîte de dialogue qui demande à l'utilisateur d'entrer un nom de contact.
+    une boîte de dialogue qui demande à l'utilisateur d'entrer un nom de contact.
     Qt fournit la classe QDialog, que nous sous-classons dans ce chapitre pour
-    implémenter la class \c FindDialog.
+    implémenter la class \c FindDialog.
 
-    \section1 Définition de la classe FindDialog
+    \section1 Définition de la classe FindDialog
 
     \image addressbook-tutorial-part5-finddialog.png
 
-    Pour sous-classer QDialog, nous commençons par inclure le header de
-    QDialog dans le fichier \c finddialog.h. De plus, nous déclarons les
+    Pour sous-classer QDialog, nous commençons par inclure le header de
+    QDialog dans le fichier \c finddialog.h. De plus, nous déclarons les
     classes QLineEdit et QPushButton car nous utilisons ces widgets dans
     notre classe dialogue.
 
     Tout comme dans la classe \c AddressBook, la classe \c FindDialog utilise
-    la macro Q_OBJECT et son constructeur est défini de façon à accepter
-    un QWidget parent, même si cette boîte de dialogue sera affichée dans une
-    fenêtre séparée.
+    la macro Q_OBJECT et son constructeur est défini de façon à accepter
+    un QWidget parent, même si cette boîte de dialogue sera affichée dans une
+    fenêtre séparée.
 
     \snippet tutorials/addressbook/part5/finddialog.h FindDialog header
 
-    Nous définissons la méthode publique \c getFindText() pour être utilisée
+    Nous définissons la méthode publique \c getFindText() pour être utilisée
     par les classes qui instancient \c FindDialog, ce qui leur permet d'obtenir
-    le texte entré par l'utilisateur. Un slot public, \c findClicked(), est
-    défini pour prendre en charge le texte lorsque l'utilisateur clique sur
+    le texte entré par l'utilisateur. Un slot public, \c findClicked(), est
+    défini pour prendre en charge le texte lorsque l'utilisateur clique sur
     le bouton \gui Find.
 
-    Finalement, nous définissons les variables privées \c findButton,
+    Finalement, nous définissons les variables privées \c findButton,
     \c lineEdit et \c findText, qui correspondent respectivement au bouton
     \gui Find, au champ de texte dans lequel l'utilisateur tape le texte
-    à rechercher, et à une variable interne stockant le texte pour une
-    utilisation ultérieure.
+    à rechercher, et à une variable interne stockant le texte pour une
+    utilisation ultérieure.
 
-    \section1 Implémentation de la classe FindDialog
+    \section1 Implémentation de la classe FindDialog
 
     Dans le constructeur de \c FindDialog, nous instancions les objets des
-    variables privées \c lineEdit, \c findButton et \c findText. Nous utilisons ensuite
+    variables privées \c lineEdit, \c findButton et \c findText. Nous utilisons ensuite
     un QHBoxLayout pour positionner les widgets.
 
     \snippet tutorials/addressbook/part5/finddialog.cpp constructor
 
-    Nous mettons en place la mise en page et le titre de la fenêtre, et
+    Nous mettons en place la mise en page et le titre de la fenêtre, et
     nous connectons les signaux aux slots. Remarquez que le signal
-    \l{QPushButton::clicked()}{clicked()} de \c{findButton} est connecté
-    à \c findClicked() et \l{QDialog::accept()}{accept()}. Le slot
+    \l{QPushButton::clicked()}{clicked()} de \c{findButton} est connecté
+    à \c findClicked() et \l{QDialog::accept()}{accept()}. Le slot
     \l{QDialog::accept()}{accept()} fourni par le QDialog ferme
-    la boîte de dialogue et lui donne le code de retour \l{QDialog::}{Accepted}.
-    Nous utilisons cette fonction pour aider la méthode \c findContact() de la classe
-    \c{AddressBook} à savoir si l'objet \c FindDialog a été fermé. Ceci sera
-    expliqué plus loin lorsque nous verrons la méthode \c findContact().
+    la boîte de dialogue et lui donne le code de retour \l{QDialog::}{Accepted}.
+    Nous utilisons cette fonction pour aider la méthode \c findContact() de la classe
+    \c{AddressBook} à savoir si l'objet \c FindDialog a été fermé. Ceci sera
+    expliqué plus loin lorsque nous verrons la méthode \c findContact().
 
     \image addressbook-tutorial-part5-signals-and-slots.png
 
     Dans \c findClicked(), nous validons le champ de texte pour nous
-    assurer que l'utilisateur n'a pas cliqué sur le bouton \gui Find sans
-    avoir entré un nom de contact. Ensuite, nous stockons le texte du champ
-    d'entrée \c lineEdit dans \c findText. Et finalement nous vidons le
-    contenu de \c lineEdit et cachons la boîte de dialogue.
+    assurer que l'utilisateur n'a pas cliqué sur le bouton \gui Find sans
+    avoir entré un nom de contact. Ensuite, nous stockons le texte du champ
+    d'entrée \c lineEdit dans \c findText. Et finalement nous vidons le
+    contenu de \c lineEdit et cachons la boîte de dialogue.
 
     \snippet tutorials/addressbook/part5/finddialog.cpp findClicked() function
 
-    La variable \c findText a un accesseur publique associé: \c getFindText().
-    Étant donné que nous ne modifions \c findText directement que dans le
-    constructeur et la méthode \c findClicked(), nous ne créons pas
-    de manipulateurs associé à \c getFindText().
+    La variable \c findText a un accesseur publique associé: \c getFindText().
+    Étant donné que nous ne modifions \c findText directement que dans le
+    constructeur et la méthode \c findClicked(), nous ne créons pas
+    de manipulateurs associé à \c getFindText().
     Puisque \c getFindText() est publique, les classes instanciant et
-    utilisant \c FindDialog peuvent toujours accéder à la chaîne de
-    caractères que l'utilisateur a entré et accepté.
+    utilisant \c FindDialog peuvent toujours accéder à la chaîne de
+    caractères que l'utilisateur a entré et accepté.
 
     \snippet tutorials/addressbook/part5/finddialog.cpp getFindText() function
 
-    \section1 Définition de la classe AddressBook
+    \section1 Définition de la classe AddressBook
 
     Pour utiliser \c FindDialog depuis la classe \c AddressBook, nous
     incluons \c finddialog.h dans le fichier \c addressbook.h.
 
     \snippet tutorials/addressbook/part5/addressbook.h include finddialog's header
 
-    Jusqu'ici, toutes les fonctionnalités du carnet d'adresses ont un
-    QPushButton et un slot correspondant. De la même façon, pour la
-    fonctionnalité \gui Find, nous avons \c findButton et \c findContact().
+    Jusqu'ici, toutes les fonctionnalités du carnet d'adresses ont un
+    QPushButton et un slot correspondant. De la même façon, pour la
+    fonctionnalité \gui Find, nous avons \c findButton et \c findContact().
 
-    Le \c findButton est déclaré comme une variable privée et la
-    méthode \c findContact() est déclarée comme un slot public.
+    Le \c findButton est déclaré comme une variable privée et la
+    méthode \c findContact() est déclarée comme un slot public.
 
     \snippet tutorials/addressbook/part5/addressbook.h findContact() declaration
     \dots
     \snippet tutorials/addressbook/part5/addressbook.h findButton declaration
 
-    Finalement, nous déclarons la variable privée \c dialog que nous allons
-    utiliser pour accéder à une instance de \c FindDialog.
+    Finalement, nous déclarons la variable privée \c dialog que nous allons
+    utiliser pour accéder à une instance de \c FindDialog.
 
     \snippet tutorials/addressbook/part5/addressbook.h FindDialog declaration
 
-    Une fois que nous avons instancié la boîte de dialogue, nous voulons l'utiliser
-    plus qu'une fois. Utiliser une variable privée nous permet d'y référer
-    à plus d'un endroit dans la classe.
+    Une fois que nous avons instancié la boîte de dialogue, nous voulons l'utiliser
+    plus qu'une fois. Utiliser une variable privée nous permet d'y référer
+    à plus d'un endroit dans la classe.
 
-    \section1 Implémentation de la classe AddressBook
+    \section1 Implémentation de la classe AddressBook
 
-    Dans le constructeur de \c AddressBook, nous instancions nos objets privés,
+    Dans le constructeur de \c AddressBook, nous instancions nos objets privés,
     \c findbutton et \c findDialog:
 
     \snippet tutorials/addressbook/part5/addressbook.cpp instantiating findButton
@@ -814,25 +814,25 @@
     \snippet tutorials/addressbook/part5/addressbook.cpp instantiating FindDialog
 
     Ensuite, nous connectons le signal \l{QPushButton::clicked()}{clicked()} de
-    \c{findButton} à \c findContact().
+    \c{findButton} à \c findContact().
 
     \snippet tutorials/addressbook/part5/addressbook.cpp signals and slots for find
 
-    Maintenant, tout ce qui manque est le code de notre méthode \c findContact():
+    Maintenant, tout ce qui manque est le code de notre méthode \c findContact():
 
     \snippet tutorials/addressbook/part5/addressbook.cpp findContact() function
 
-    Nous commençons par afficher l'instance de \c FindDialog, \c dialog.
-    L'utilisateur peut alors entrer le nom du contact à rechercher. Lorsque
-    l'utilisateur clique sur le bouton \c findButton, la boîte de dialogue est
-    masquée et le code de retour devient QDialog::Accepted. Ce code de retour
+    Nous commençons par afficher l'instance de \c FindDialog, \c dialog.
+    L'utilisateur peut alors entrer le nom du contact à rechercher. Lorsque
+    l'utilisateur clique sur le bouton \c findButton, la boîte de dialogue est
+    masquée et le code de retour devient QDialog::Accepted. Ce code de retour
     vient remplir la condition du premier if.
 
     Ensuite, nous extrayons le texte que nous utiliserons pour la recherche,
-    il s'agit ici de \c contactName obtenu à l'aide de la méthode \c getFindText()
+    il s'agit ici de \c contactName obtenu à l'aide de la méthode \c getFindText()
     de \c FindDialog. Si le contact existe dans le carnet d'adresse, nous
     l'affichons directement. Sinon, nous affichons le QMessageBox suivant pour
-    indiquer que la recherche à échouée.
+    indiquer que la recherche à échouée.
 
     \image addressbook-tutorial-part5-notfound.png
 */
@@ -845,49 +845,49 @@
     \example tutorials/addressbook-fr/part6
     \title Carnet d'Adresses 6 - Sauvegarde et chargement
 
-    Ce chapitre couvre les fonctionnalités de gestion des fichiers de Qt que
-    l'on utilise pour écrire les procédures de sauvegarde et chargement pour
+    Ce chapitre couvre les fonctionnalités de gestion des fichiers de Qt que
+    l'on utilise pour écrire les procédures de sauvegarde et chargement pour
     l'application carnet d'adresses.
 
     \image addressbook-tutorial-part6-screenshot.png
 
     Bien que la navigation et la recherche de contacts soient des
-    fonctionnalités importantes, notre carnet d'adresses ne sera pleinement
+    fonctionnalités importantes, notre carnet d'adresses ne sera pleinement
     utilisable qu'une fois que l'on pourra sauvegarder les contacts existants
-    et les charger à nouveau par la suite.
-    Qt fournit de nombreuses classes pour gérer les \l{Input/Output and
-    Networking}{entrées et sorties}, mais nous avons choisi de nous contenter d'une
-    combinaison de deux classes simples à utiliser ensemble: QFile et QDataStream.
+    et les charger à nouveau par la suite.
+    Qt fournit de nombreuses classes pour gérer les \l{Input/Output and
+    Networking}{entrées et sorties}, mais nous avons choisi de nous contenter d'une
+    combinaison de deux classes simples à utiliser ensemble: QFile et QDataStream.
 
-    Un objet QFile représente un fichier sur le disque qui peut être lu, et
-    dans lequel on peut écrire. QFile est une classe fille de la classe plus
-    générique QIODevice, qui peut représenter différents types de
-    périphériques.
+    Un objet QFile représente un fichier sur le disque qui peut être lu, et
+    dans lequel on peut écrire. QFile est une classe fille de la classe plus
+    générique QIODevice, qui peut représenter différents types de
+    périphériques.
 
-    Un objet QDataStream est utilisé pour sérialiser des données binaires
-    dans le but de les passer à un QIODevice pour les récupérer dans le
-    futur. Pour lire ou écrire dans un QIODevice, il suffit d'ouvrir le
-    flux, avec le périphérique approprié en paramètre, et d'y lire ou
-    écrire.
+    Un objet QDataStream est utilisé pour sérialiser des données binaires
+    dans le but de les passer à un QIODevice pour les récupérer dans le
+    futur. Pour lire ou écrire dans un QIODevice, il suffit d'ouvrir le
+    flux, avec le périphérique approprié en paramètre, et d'y lire ou
+    écrire.
 
-    \section1 Définition de la classe AddressBook
+    \section1 Définition de la classe AddressBook
 
-    On déclare deux slots publics, \c saveToFile() et \c loadFromFile(), 
+    On déclare deux slots publics, \c saveToFile() et \c loadFromFile(), 
     ainsi que deux objets QPushButton, \c loadButton et \c saveButton.
 
     \snippet tutorials/addressbook/part6/addressbook.h save and load functions declaration
     \dots
     \snippet tutorials/addressbook/part6/addressbook.h save and load buttons declaration
 
-    \section1 Implémentation de la classe AddressBook
+    \section1 Implémentation de la classe AddressBook
 
     Dans notre constructeur, on instancie \c loadButton et \c saveButton.
-    Idéalement, l'interface serait plus conviviale avec des boutons
+    Idéalement, l'interface serait plus conviviale avec des boutons
     affichant "Load contacts from a file" et "Save contacts to a file". Mais
     compte tenu de la dimension des autres boutons, on initialise les labels
-    des boutons à \gui{Load...} et \gui{Save...}. Heureusement, Qt offre une
-    façon simple d'ajouter des info-bulles avec
-    \l{QWidget::setToolTip()}{setToolTip()}, et nous l'exploitons de la façon
+    des boutons à \gui{Load...} et \gui{Save...}. Heureusement, Qt offre une
+    façon simple d'ajouter des info-bulles avec
+    \l{QWidget::setToolTip()}{setToolTip()}, et nous l'exploitons de la façon
     suivante pour nos boutons:
 
     \snippet tutorials/addressbook/part6/addressbook.cpp tooltip 1
@@ -895,85 +895,85 @@
     \snippet tutorials/addressbook/part6/addressbook.cpp tooltip 2
 
     Bien qu'on ne cite pas le code correspondant ici, nous ajoutons ces deux boutons au
-    layout de droite, \c button1Layout, comme pour les fonctionnalités précédentes, et 
+    layout de droite, \c button1Layout, comme pour les fonctionnalités précédentes, et 
     nous connectons leurs signaux
-    \l{QPushButton::clicked()}{clicked()} à leurs slots respectifs.
+    \l{QPushButton::clicked()}{clicked()} à leurs slots respectifs.
 
-    Pour la sauvegarde, on commence par récupérer le nom de fichier 
+    Pour la sauvegarde, on commence par récupérer le nom de fichier 
     \c fileName, en utilisant QFileDialog::getSaveFileName(). C'est une
-    méthode pratique fournie par QFileDialog, qui ouvre une boîte de
-    dialogue modale et permet à l'utilisateur d'entrer un nom de fichier ou
+    méthode pratique fournie par QFileDialog, qui ouvre une boîte de
+    dialogue modale et permet à l'utilisateur d'entrer un nom de fichier ou
     de choisir un fichier \c{.abk} existant. Les fichiers \c{.abk}
-    correspondent à l'extension choisie pour la sauvegarde des contacts de
+    correspondent à l'extension choisie pour la sauvegarde des contacts de
     notre carnet d'adresses.
 
     \snippet tutorials/addressbook/part6/addressbook.cpp saveToFile() function part1
 
-    La boîte de dialogue affichée est visible sur la capture d'écran ci-
+    La boîte de dialogue affichée est visible sur la capture d'écran ci-
     dessous.
 
     \image addressbook-tutorial-part6-save.png
 
-    Si \c fileName n'est pas vide, on crée un objet QFile, \c file, à partir
-    de \c fileName. QFile fonctionne avec QDataStream puisqu'il dérive de
+    Si \c fileName n'est pas vide, on crée un objet QFile, \c file, à partir
+    de \c fileName. QFile fonctionne avec QDataStream puisqu'il dérive de
     QIODevice.
 
-    Ensuite, on essaie d'ouvrir le fichier en écriture, ce qui correspond au
-    mode \l{QIODevice::}{WriteOnly}. Si cela échoue, on en informe
+    Ensuite, on essaie d'ouvrir le fichier en écriture, ce qui correspond au
+    mode \l{QIODevice::}{WriteOnly}. Si cela échoue, on en informe
     l'utilisateur avec une QMessageBox.
 
     \snippet tutorials/addressbook/part6/addressbook.cpp saveToFile() function part2
 
     Dans le cas contraire, on instancie un objet QDataStream, \c out, afin
-    d'écrire dans le fichier ouvert. QDataStream nécessite que la même
-    version de flux soit utilisée pour la lecture et l'écriture. On s'assure
-    que c'est le cas en spécifiant explicitement d'utiliser la
+    d'écrire dans le fichier ouvert. QDataStream nécessite que la même
+    version de flux soit utilisée pour la lecture et l'écriture. On s'assure
+    que c'est le cas en spécifiant explicitement d'utiliser la
     \l{QDataStream::Qt_4_5}{version introduite avec Qt 4.5} avant de
-    sérialiser les données vers le fichier \c file.
+    sérialiser les données vers le fichier \c file.
 
     \snippet tutorials/addressbook/part6/addressbook.cpp saveToFile() function part3
 
-    Pour le chargement, on récupère également \c fileName en utilisant
-    QFileDialog::getOpenFileName(). Cette méthode est l'homologue de
-    QFileDialog::getSaveFileName() et affiche également une boîte de
-    dialogue modale permettant à l'utilisateur d'entrer un nom de fichier ou
+    Pour le chargement, on récupère également \c fileName en utilisant
+    QFileDialog::getOpenFileName(). Cette méthode est l'homologue de
+    QFileDialog::getSaveFileName() et affiche également une boîte de
+    dialogue modale permettant à l'utilisateur d'entrer un nom de fichier ou
     de selectionner un fichier \c{.abk} existant, afin de le charger dans le
     carnet d'adresses.
 
     \snippet tutorials/addressbook/part6/addressbook.cpp loadFromFile() function part1
 
-    Sous Windows, par exemple, cette méthode affiche une boîte de dialogue
-    native pour la sélection de fichier, comme illustré sur la capture
-    d'écran suivante:
+    Sous Windows, par exemple, cette méthode affiche une boîte de dialogue
+    native pour la sélection de fichier, comme illustré sur la capture
+    d'écran suivante:
 
     \image addressbook-tutorial-part6-load.png
 
     Si \c fileName n'est pas vide, on utilise une fois de plus un objet
     QFile, \c file, et on tente de l'ouvrir en lecture, avec le mode
-    \l{QIODevice::}{ReadOnly}. De même que précédemment dans notre
-    implémentation de \c saveToFile(), si cette tentative s'avère
+    \l{QIODevice::}{ReadOnly}. De même que précédemment dans notre
+    implémentation de \c saveToFile(), si cette tentative s'avère
     infructueuse, on en informe l'utilisateur par le biais d'une
     QMessageBox.
 
     \snippet tutorials/addressbook/part6/addressbook.cpp loadFromFile() function part2
 
     Dans le cas contraire, on instancie un objet QDataStream, \c in, en
-    spécifiant la version à utiliser comme précédemment, et on lit les
-    informations sérialisées vers la structure de données \c contacts. Notez
+    spécifiant la version à utiliser comme précédemment, et on lit les
+    informations sérialisées vers la structure de données \c contacts. Notez
     qu'on purge \c contacts avant d'y mettre les informations lues afin de
-    simplifier le processus de lecture de fichier. Une façon plus avancée de
-    procéder serait de lire les contacts dans un objet QMap temporaire, et
+    simplifier le processus de lecture de fichier. Une façon plus avancée de
+    procéder serait de lire les contacts dans un objet QMap temporaire, et
     de copier uniquement les contacts n'existant pas encore dans
     \c contacts.
 
     \snippet tutorials/addressbook/part6/addressbook.cpp loadFromFile() function part3
 
     Pour afficher les contacts lus depuis le fichier, on doit d'abord
-    valider les données obtenues afin de s'assurer que le fichier lu
-    contient effectivement des entrées de carnet d'adresses. Si c'est le
+    valider les données obtenues afin de s'assurer que le fichier lu
+    contient effectivement des entrées de carnet d'adresses. Si c'est le
     cas, on affiche le premier contact; sinon on informe l'utilisateur du
-    problème par une QMessageBox. Enfin, on met à jour l'interface afin
-    d'activer et de désactiver les boutons de façon appropriée.
+    problème par une QMessageBox. Enfin, on met à jour l'interface afin
+    d'activer et de désactiver les boutons de façon appropriée.
 */
 
 /*!
@@ -981,86 +981,86 @@
     \previouspage {tutorials/addressbook-fr/part6}{Chapitre 6}
     \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
     \example tutorials/addressbook-fr/part7
-    \title Carnet d'adresse 7 - Fonctionnalités avancées
+    \title Carnet d'adresse 7 - Fonctionnalités avancées
 
-    Ce chapitre couvre quelques fonctionnalités additionnelles qui
+    Ce chapitre couvre quelques fonctionnalités additionnelles qui
     feront de notre carnet d'adresses une application plus pratique
     pour une utilisation quotidienne.
 
     \image addressbook-tutorial-part7-screenshot.png
 
     Bien que notre application carnet d'adresses soit utile en tant que telle,
-    il serait pratique de pouvoir échanger les contacts avec d'autres applications.
-    Le format vCard est un un format de fichier populaire pour échanger
-    ce type de données.
-    Dans ce chapitre, nous étendrons notre carnet d'adresses pour permettre
+    il serait pratique de pouvoir échanger les contacts avec d'autres applications.
+    Le format vCard est un un format de fichier populaire pour échanger
+    ce type de données.
+    Dans ce chapitre, nous étendrons notre carnet d'adresses pour permettre
     d'exporter des contacts dans des fichiers vCard \c{.vcf}.
 
-    \section1 Définition de la classe AddressBook
+    \section1 Définition de la classe AddressBook
 
     Nous ajoutons un objet QPushButton, \c exportButton, et un slot
-    public correspondant, \c exportAsVCard(), à notre classe \c AddressBook 
+    public correspondant, \c exportAsVCard(), à notre classe \c AddressBook 
     dans le fichier \c addressbook.h.
 
     \snippet tutorials/addressbook/part7/addressbook.h exportAsVCard() declaration
     \dots
     \snippet tutorials/addressbook/part7/addressbook.h exportButton declaration
 
-    \section1 Implémentation de la classe AddressBook
+    \section1 Implémentation de la classe AddressBook
 
     Dans le constructeur de \c AddressBook, nous connectons le signal
     \l{QPushButton::clicked()}{clicked()} de \c{exportButton} au slot
     \c exportAsVCard().
-    Nous ajoutons aussi ce bouton à \c buttonLayout1, le layout responsable
+    Nous ajoutons aussi ce bouton à \c buttonLayout1, le layout responsable
     du groupe de boutons sur la droite.
 
-    Dans la méthode \c exportAsVCard(), nous commençons par extraire le
-    nom du contact dans \n name. Nous déclarons \c firstname, \c lastName et
+    Dans la méthode \c exportAsVCard(), nous commençons par extraire le
+    nom du contact dans \n name. Nous déclarons \c firstname, \c lastName et
     \c nameList.
     Ensuite, nous cherchons la position du premier espace blanc de \c name.
-    Si il y a un espace, nous séparons le nom du contact en \c firstName et
-    \c lastName. Finalement, nous remplaçons l'espace par un underscore ("_").
+    Si il y a un espace, nous séparons le nom du contact en \c firstName et
+    \c lastName. Finalement, nous remplaçons l'espace par un underscore ("_").
     Si il n'y a pas d'espace, nous supposons que le contact ne comprend que
-    le prénom.
+    le prénom.
 
     \snippet tutorials/addressbook/part7/addressbook.cpp export function part1
 
-    Comme pour la méthode \c saveToFile(), nous ouvrons une boîte de dialogue
-    pour donner la possibilité à l'utilisateur de choisir un emplacement pour
-    le fichier. Avec le nom de fichier choisi, nous créons une instance de QFile
-    pour y écrire.
+    Comme pour la méthode \c saveToFile(), nous ouvrons une boîte de dialogue
+    pour donner la possibilité à l'utilisateur de choisir un emplacement pour
+    le fichier. Avec le nom de fichier choisi, nous créons une instance de QFile
+    pour y écrire.
 
     Nous essayons d'ouvrir le fichier en mode \l{QIODevice::}{WriteOnly}. Si
-    cela échoue, nous affichons un QMessageBox pour informer l'utilisateur
-    à propos de l'origine du problème et nous quittons la méthode. Sinon, nous passons le
-    fichier comme paramètre pour créer un objet QTextStream, \c out. De la même façon que
-    QDataStream, la classe QTextStream fournit les fonctionnalités pour 
-    lire et écrire des fichiers de texte. Grâce à celà, le fichier \c{.vcf}
-    généré pourra être ouvert et édité à l'aide d'un simple éditeur de texte.
+    cela échoue, nous affichons un QMessageBox pour informer l'utilisateur
+    à propos de l'origine du problème et nous quittons la méthode. Sinon, nous passons le
+    fichier comme paramètre pour créer un objet QTextStream, \c out. De la même façon que
+    QDataStream, la classe QTextStream fournit les fonctionnalités pour 
+    lire et écrire des fichiers de texte. Grâce à celà, le fichier \c{.vcf}
+    généré pourra être ouvert et édité à l'aide d'un simple éditeur de texte.
 
     \snippet tutorials/addressbook/part7/addressbook.cpp export function part2
 
-    Nous écrivons ensuite un fichier vCard avec la balise \c{BEGIN:VCARD},
+    Nous écrivons ensuite un fichier vCard avec la balise \c{BEGIN:VCARD},
     suivit par \c{VERSION:2.1}.
-    Le nom d'un contact est écrit à l'aide de la balise \c{N:}. Pour la balise
-    \c{FN:}, qui remplit le titre du contact, nous devons vérifier si le contact
-    à un nom de famille défini ou non. Si oui, nous utilions les détails de
-    \c nameList pour remplir le champ, dans le cas contraire on écrit uniquement le contenu
+    Le nom d'un contact est écrit à l'aide de la balise \c{N:}. Pour la balise
+    \c{FN:}, qui remplit le titre du contact, nous devons vérifier si le contact
+    à un nom de famille défini ou non. Si oui, nous utilions les détails de
+    \c nameList pour remplir le champ, dans le cas contraire on écrit uniquement le contenu
     de \c firstName.
  
     \snippet tutorials/addressbook/part7/addressbook.cpp export function part3
 
-    Nous continuons en écrivant l'adresse du contact. Les points-virgules
-    dans l'adresse sont échappés à l'aide de "\\", les retours de ligne sont
-    remplacés par des points-virgules, et les vigules sont remplacées par des espaces.
-    Finalement nous écrivons les balises  \c{ADR;HOME:;} suivies par l'adresse
+    Nous continuons en écrivant l'adresse du contact. Les points-virgules
+    dans l'adresse sont échappés à l'aide de "\\", les retours de ligne sont
+    remplacés par des points-virgules, et les vigules sont remplacées par des espaces.
+    Finalement nous écrivons les balises  \c{ADR;HOME:;} suivies par l'adresse
     et la balise \c{END:VCARD}.
 
     \snippet tutorials/addressbook/part7/addressbook.cpp export function part4
 
-    À la fin de la méthode, un QMessageBox est affiché pour informer l'utilisateur
-    que la vCard a été exportée avec succès. 
+    À la fin de la méthode, un QMessageBox est affiché pour informer l'utilisateur
+    que la vCard a été exportée avec succès. 
 
-    \e{vCard est une marque déposée de \l{http://www.imc.org}
+    \e{vCard est une marque déposée de \l{http://www.imc.org}
     {Internet Mail Consortium}}.
 */
diff --git a/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc b/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
new file mode 100644
index 0000000..1c2f56b
--- /dev/null
+++ b/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page how-to-learn-qt.html
+    \title 如何学习 Qt
+    \brief Links to guides and resources for learning Qt.
+    \nextpage 教程
+
+    \section1 Getting Started
+
+    我们�定您已了解 C++， 并将用于 Qt 开�。有关将 Qt 与其他编程语言一起使用的更多信�，请�� \l{Qt website}{Qt 网站}。
+
+    如果你想仅使用 C++ 编程, �使用任何设计工具而仅使用代�设计用户界�，请观看\l{教程}。这些教程是为您了解 Qt 编程�身定�的，并侧�于编写�用代�，而并�功能简介。
+
+    如果您想使用设计工具�设计用户界�，则至少�阅读 \l{Qt Designer manual}{Qt 设计者手册}的�几章。
+
+    现在您已�编写了一些�型�用的应用程�，并对 Qt 编程有更加广泛的了解。您�以直接�手�自己的项目，但我们建议您阅读以下一些关键简介以加深您对 Qt 的了解：\l{Qt Object Model}Qt 对象模型}和\l{Signals and Slots}{信�和槽}。
+
+    \beginfloatleft
+    \inlineimage qtdemo-small.png
+    \endfloat
+
+    \section1 了解概况
+
+    在这个阶段，我们建议您�览一下\l{All Overviews and HOWTOs}{简介}，然�阅读与您项目相关的章节。您�能还会�现，�览与您项目类似的\l{Qt Examples}{示例}的�代�也会对您有所帮助。由于 Qt �代�已��公众开放，您也�阅读 Qt �代�。
+
+    如果您�行\l{Examples and Demos Launcher}{示例和演示�动程�}，您就会看到许多正在使用的 Qt widget。
+
+    \l{Qt Widget Gallery} 还按照在��支�平�上的使用风格�供了精选 Qt widget 简介。
+    \clearfloat
+
+    \section1 Books and Learning Materials
+
+    Qt 附带大�文档，并全文带有超文本交�引用，�轻�地点击了解自己想知�的内容。您使用最多的文档�能是 \l{index.html}{API 引用}。�个链接都�供了�览 API 引用的��方�，您��个都�试一下，看哪个更适�自己。您还�以�试 \l{Qt Assistant}，这是� Qt 附带的工具，�访问全部 Qt API，并�供全文本�索功能。
+
+    有大�的书�是关于 Qt 编程的。有关 Qt 书�的完整列表。
+    We recommend the official Qt book,
+    \l{http://www.amazon.com/gp/product/0132354160/ref=ase_trolltech/}{C++
+    GUI Programming with Qt 4, Second Edition} (ISBN 0-13-235416-0).
+    本书从 "Hello Qt" 到高级功能（如多线程�2D 和 3D 图形�网络�内容视图类与 XML），全�详实地说明了 Qt 编程。（第一版基于 Qt 4.1，�\l{http://www.qtrac.eu/C++-GUI-Programming-with-Qt-4-1st-ed.zip}{在线}获得。）
+
+    包括��语言的翻译版本，请��\l{Books about Qt Programming}{有关 Qt 编程的书�}。
+
+    �一个有关实例代�和 Qt 功能说明的有用资�就是存档的 \l{Qt Quarterly}{Qt 季讯}文章，季讯是为 Qt 用户�供的新闻时讯。
+
+    有关特定 Qt 模�和其他指�的文档，请��\l{All Overviews and HOWTOs}。
+
+    \section1 Further Reading
+
+    Qt has an active and helpful user community who communicate using
+    the \l{Qt Mailing Lists}{qt-interest} mailing list, the \l{Qt Centre}
+    Web site, and a number of other community Web sites and Weblogs.
+    In addition, many Qt developers are active members of the
+    \l{KDE}{KDE community}.
+
+    �您好�并且学习愉快�
+*/
diff --git a/doc/src/zh_CN/getting-started/tutorials.qdoc b/doc/src/zh_CN/getting-started/tutorials.qdoc
new file mode 100644
index 0000000..dc371d8
--- /dev/null
+++ b/doc/src/zh_CN/getting-started/tutorials.qdoc
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page tutorials.html
+    \title 教程
+
+    \contentspage 如何学习 Qt
+
+    \brief Tutorials, guides and overviews to help you learn Qt.
+
+    A collection of tutorials and "walkthrough" guides are provided with Qt to
+    help new users get started with Qt development. These documents cover a
+    range of topics, from basic use of widgets to step-by-step tutorials that
+    show how an application is put together.
+
+    \table
+    \row
+    \o{2,1} \l{Widgets 教程}{\bold Widgets}
+    \o{2,1} \l{地�簿教程}{\bold {地�簿}}
+    \row
+    \o \image widget-examples.png Widgets
+    \o
+    A beginner's guide to getting started with widgets and layouts to create
+    GUI applications.
+
+    \o \image addressbook-tutorial.png 地�簿
+    \o
+    A seven part guide to creating a fully-functioning address book
+    application. This tutorial is also available with
+    \l{Tutoriel "Carnet d'adresses"}{French explanation}.
+
+    \row
+    \o{2,1} \l{A Quick Start to Qt Designer}{\bold{Qt Designer}}
+    \o{2,1} \l{Qt Linguist Manual: Programmers#Tutorials}{\bold {Qt Linguist}}
+    \row
+    \o \image designer-examples.png QtDesigner
+    \o
+    A quick guide through \QD showing the basic steps to create a
+    form with this interactive tool.
+
+    \o \image linguist-examples.png QtLinguist
+    \o
+    A guided tour through the translations process, explaining the
+    tools provided for developers, translators and release managers.
+
+    \row
+    \o{2,1} \l{QTestLib Tutorial}{\bold QTestLib}
+    \o{2,1} \l{qmake Tutorial}{\bold qmake}
+    \row
+    \o{2,1}
+    This tutorial gives a short introduction to how to use some of the
+    features of Qt's unit-testing framework, QTestLib. It is divided into
+    four chapters.
+
+    \o{2,1}
+    This tutorial teaches you how to use \c qmake. We recommend that
+    you read the \l{qmake Manual}{qmake user guide} after completing
+    this tutorial.
+
+    \endtable
+*/
diff --git a/doc/src/zh_CN/tutorials/addressbook.qdoc b/doc/src/zh_CN/tutorials/addressbook.qdoc
new file mode 100644
index 0000000..72349af
--- /dev/null
+++ b/doc/src/zh_CN/tutorials/addressbook.qdoc
@@ -0,0 +1,673 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page tutorials-addressbook.html
+
+    \startpage {index.html}{Qt Reference Documentation}
+    \contentspage 教程
+    \nextpage {tutorials/addressbook/part1}{第一章}
+
+    \title 地�簿教程
+    \brief 本教程介�了使用 Qt 跨平�框架的 GUI 编程。
+
+    本教程介�了使用 Qt 跨平�框架的 GUI 编程。
+
+    \image addressbook-tutorial-screenshot.png
+
+    \omit
+    It doesn't cover everything; the emphasis is on teaching the programming
+    philosophy of GUI programming, and Qt's features are introduced as needed.
+    Some commonly used features are never used in this tutorial.
+    \endomit
+
+    在学习过程中，我们将了解部分 Qt 基本技术，如
+
+    \list
+    \o Widget 和布局管�器
+    \o 容器类
+    \o 信�和槽
+    \o 输入和输出设备
+    \endlist
+
+    如果您完全�了解 Qt，请阅读\l{How to Learn Qt}{如何学习 Qt}（如果您还未阅读）。
+
+    教程的�代��于 Qt 的 \c examples/tutorials/addressbook 目录下。
+
+    教程章节：
+
+    \list 1
+    \o \l{tutorials/addressbook/part1}{设计用户界�}
+    \o \l{tutorials/addressbook/part2}{添加地�}
+    \o \l{tutorials/addressbook/part3}{�览地�簿�目}
+    \o \l{tutorials/addressbook/part4}{编辑和删除地�}
+    \o \l{tutorials/addressbook/part5}{添加查找功能}
+    \o \l{tutorials/addressbook/part6}{加载和�存}
+    \o \l{tutorials/addressbook/part7}{附加功能}
+    \endlist
+
+    虽然这个�型应用程�看起�并�象一个�熟的现代 GUI 应用程�，但它使用多�用于更��应用程�的基本技术。在您完�学习之�，我们建议您查看一下\l{mainwindows/application}{应用程�}示例，它�供带有���工具��状��等项目的�型 GUI 应用程�。
+*/
+
+/*!
+    \page tutorials-addressbook-part1.html
+    \contentspage {地�簿教程}{目录}
+    \nextpage {tutorials/addressbook/part2}{第二章}
+    \example tutorials/addressbook/part1
+    \title 地�簿 1 — 设计用户界�
+
+    本教程的第一部分讲述了用于地�簿应用程�的基本图形用户界� (GUI) 的设计。
+
+    创建 GUI 程�的第一步就是设计用户界�。在本章中，我们的目标是设置应用基本地�簿应用程�所需的标签和输入字段。下图为期望输出的�幕截图。
+
+    \image addressbook-tutorial-part1-screenshot.png
+
+    我们需�使用两个 QLabel 对象：\c nameLabel 和 \c addressLabel，以�两个输入字段：QLineEdit 对象 \c nameLine 和 QTextEdit
+    对象 \c addressText，这样用户�能输入�系人的姓�和地�。使用的 widget �其�置如下图所示。
+
+    \image addressbook-tutorial-part1-labeled-screenshot.png
+
+    �应用地�簿需使用三个文件：
+
+    \list
+        \o \c{addressbook.h} — AddressBook 类的定义文件，
+        \o \c{addressbook.cpp} — AddressBook 类的执行文件，以�
+        \o \c{main.cpp} — 包� \c main() 函数并带有 AddressBook 实例的文件。
+    \endlist
+
+    \section1 Qt 编程 — 使用�类
+
+    在编写 Qt 程�时，我们通常使用 Qt 对象�类�添加功能。这是创建定制 widget 或标准 widget 集�的基本概念之一。使用�类扩展或改� widget 的�作具有以下优势：
+
+    \list
+    \o 我们�以编写虚函数或纯虚函数应用，以得到我们确切所需的功能，并在需�时�使用基本的类应用。
+    \o 这样我们就�以在类中�装部分用户界�，应用程�的其他部分也就无需了解用户界�中�独使用的 widget。
+    \o �使用�类在�一应用程�或库中创建多个定制 widget，这样�类的代��在其他项目��使用。
+    \endlist
+
+    由于 Qt 未�供特定的地�簿 widget，我们在标准的 Qt widget 类中使用�类，然�添加功能。我们在本教程中创建的 \c AddressBook 类在需�使用基本地�簿 widget 的情况下���使用。
+
+    \section1 定义 AddressBook 类
+
+    \l{tutorials/addressbook/part1/addressbook.h}{\c addressbook.h} 文件用于定义 \c AddressBook  类。
+
+    我们从定义 \c AddressBook 为 QWidget �类和声明构造器开始入手。我们还使用 Q_OBJECT �表明该类使用国际化功能与 Qt 信�和槽功能，�使在本阶段�会用到所有这些功能。
+
+    \snippet tutorials/addressbook/part1/addressbook.h class definition
+
+    该类包�了 \c nameLine 和 \c addressText 的声明�上文�到的 QLineEdit 和 QTextEdit 的�有实例。在以�章节中，您会看到储存在 \c nameLine 和 \c addressText 中的数�在地�簿的许多功能中都会用到。
+
+    我们�必包��使用的 QLabel 对象的声明，这是因为在创建这些对象�我们�必对其进行引用。在下一部分中，我们会说明 Qt 记录对象所属关系的方�。
+
+    Q_OBJECT �本身应用了部分更高级的 Qt 功能。 我们暂时把 Q_OBJECT ��解为使用 \l{QObject::}{tr()} 和 \l{QObject::}{connect()} 函数的快�方�，这��解对我们的学习更有用。
+
+    我们现已完� \c addressbook.h 文件，接下�我们�执行对应的 \c addressbook.cpp 文件。
+
+    \section1 应用 AddressBook 类
+
+    \c AddressBook 的构造器接收 QWidget �数 \a parent。按惯例，我们将�数传递给基本类的构造器。这�父项�有一个或多个�项的所属概念对 Qt 中的 widget 分组�分有用。例如，如果删除父项，也会删除其所有�项。
+
+    \snippet tutorials/addressbook/part1/addressbook.cpp constructor and input fields
+
+    在该构造器中，我们声明并通过实例�表示两个局部 QLabel 对象 \c nameLabel 和 \c addressLabel，以� \c nameLine 和 \c addressText。如果字符串已进行转�，则 \l{QObject::tr()}{tr()} 函数返回已转�的字符串，�则返回字符串本身。我们�以将此函数�解 \c{<insert translation here>} 标识�标记�进行转� QString 对象。在以�章节和 \l{Qt Examples} 中，您会看到��使用了�转�的字符串就是使用该函数。
+
+    使用 Qt 编程时，了解布局是如何起作用的会对您很有帮助。Qt �供三个主�布局类 QHBoxLayout�QVBoxLayout 和 QGridLayout �处� widget 的�置。
+
+    \image addressbook-tutorial-part1-labeled-layout.png
+
+    我们使用 QGridLayout 以结构化的方�放置标签和输入字段。QGridLayout 将�用空间分为网格，并将 widget 放置在指定了行列�的�元格中。上�的图表显示了布局�元格和 widget 的�置。我们通过以下代�指定这�排列方�：
+
+    \snippet tutorials/addressbook/part1/addressbook.cpp layout
+
+    请注�，\c addressLabel 是使用作为附加�数的 Qt::AlignTop �排放�置。这�确�其�会纵�放置在�元格 (1,0) 中央。有关 Qt 布局的基本简介，请��\l{Layout Management}{布局类}文档。
+
+    �在 widget 上安装布局对象，必须调用 widget 的 \l{QWidget::setLayout()}{setLayout()} 函数：
+
+    \snippet tutorials/addressbook/part1/addressbook.cpp setting the layout
+
+    最�，我们将 widget 标题设置为“简�地�簿�。
+
+    \section1 �行应用程�
+
+    \c main() 函数使用�独的文件 \c main.cpp。在该函数中，我们实例化了 QApplication 对象 \c app。QApplication 负责管�多�应用范围的资�（如默认字体和光标），以��行事件循环。因此，在�个使用 Qt 的 GUI 应用程�中都会有一个 QApplication 对象。
+
+    \snippet tutorials/addressbook/part1/main.cpp main function
+
+    我们使用 new 关键字在堆中构造一个新的 \c AddressBook widget，然�调用 \l{QWidget::show()}{show()} 函数对其进行显示。�过，该 widget �有在应用程�事件循环开始时�会显示。我们通过调用应用程�的 \l{QApplication::}{exec()} 函数开始事件循环。该函数返回的结果作为 \c main()  函数的返回值。
+*/
+
+/*!
+    \page tutorials-addressbook-part2.html
+    \previouspage 地�簿 1 — 设计用户界�
+    \contentspage {地�簿教程}{目录}
+    \nextpage {tutorials/addressbook/part3}{第三章}
+    \example tutorials/addressbook/part2
+    \title 地�簿 2 — 添加地�
+
+    创建基本地�簿应用程�的下一步是添加少许用户互动�作。
+
+    \image addressbook-tutorial-part2-add-contact.png
+
+    我们将�供一个按钮，用户�点击该按钮�添加新�系人。此外，还需�对数�结构进行�定，以便有�地储存这些�系人。
+
+    \section1 定义 AddressBook 类
+
+    由于已�设置了标签和输入字段，我们�需添加按钮就�完�添加�系人这一步骤。也就是说，在 \c addressbook.h 文件中已�声明了三个 QPushButton 对象和三个对应的公共槽。
+
+    \snippet tutorials/addressbook/part2/addressbook.h slots
+
+    槽是对特殊信�进行�应的函数。我们将在应用 \c AddressBook  类时进一步详细说明这一概念。如需有关 Qt 信�和槽概念的简介，请��\l{Signals and Slots}{信�和槽}文档。
+
+    三个 QPushButton 对象分别是 \c addButton�\c submitButton 和 \c cancelButton，已与�在上一章中说明的 \c nameLine 和 \c addressText 一�包�在�有��声明中。
+
+    \snippet tutorials/addressbook/part2/addressbook.h pushbutton declaration
+
+    我们需�一个容器�储存地�簿�系人，这样�能�索和显示�系人。QMap 对象 \c contacts 就�实现此功能，因为其带有一个键-值对：�系人姓�作为键，而�系人地�作为\e{值}。
+
+    \snippet tutorials/addressbook/part2/addressbook.h remaining private variables
+
+    我们还会声明两个�有 QString 对象：\c oldName 和 \c oldAddress。这些对象用��留在用户点击\gui{添加}时最�显示的�系人姓�和地�。这样，当用户点击\gui{�消}时，我们就�以返回至上一个�系人的详细信�。
+
+    \section1 应用 AddressBook 类
+
+    在 \c AddressBook 构造器中，我们将 \c nameLine 和 \c addressText 设置为�读，这样就�仅显示而�必编辑现有�系人的详细信�。
+
+    \dots
+    \snippet tutorials/addressbook/part2/addressbook.cpp setting readonly 1
+    \dots
+    \snippet tutorials/addressbook/part2/addressbook.cpp setting readonly 2
+
+    然�，我们实例化以下按钮：\c addButton�\c submitButton 和 \c cancelButton。
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp pushbutton declaration
+
+    显示 \c addButton 是通过调用 \l{QPushButton::show()}{show()} 函数实现的，而�� \c submitButton 和 \c cancelButton 则需调用 \l{QPushButton::hide()}{hide()}。这两个按钮仅当用户点击\gui{添加}时�会显示，而此�作是通过在下文中说明的\c addContact() 函数处�的。
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp connecting signals and slots
+
+    我们将按钮的 \l{QPushButton::clicked()}{clicked()} 信�与其相应的槽关�。下�的图表说明了此过程。
+
+    \image addressbook-tutorial-part2-signals-and-slots.png
+
+    接下�，我们将按钮整�的排列在地�簿 widget 的�侧，使用 QVBoxLayout 将其进行纵�排列。
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp vertical layout
+
+    \l{QBoxLayout::addStretch()}{addStretch()} 函数用�确�按钮并�是采用�匀间隔排列的，而是更�近 widget 的顶部。下图显示了是�使用 \l{QBoxLayout::addStretch()}{addStretch()} 的差别。
+
+    \image addressbook-tutorial-part2-stretch-effects.png
+
+    然�，我们使用 \l{QGridLayout::addLayout()}{addLayout()} 将 \c buttonLayout1 增加至 \c mainLayout。 这样我们就有了嵌套布局，因为 \c buttonLayout1 现在是 \c mainLayout 的�项。
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp grid layout
+
+    布局�标显示如下：
+
+    \image addressbook-tutorial-part2-labeled-layout.png
+
+    在 \c addContact() 函数中，我们使用 \c oldName 和 \c oldAddress 储存最�显示的�系人详细信�。然�，我们清空这些输入字段并关闭�读模�。输入焦点设置在 \c nameLine，显示 \c submitButton 和 \c cancelButton。
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp addContact
+
+    \c submitContact() 函数�分为三个部分：
+
+    \list 1
+    \o 我们从 \c nameLine 和 \c addressText ���系人的详细信�，然�将其储存在 QString 对象中。我们还�验�确�用户没有在输入字段为空时点击\gui{�交}，�则，会显示 QMessageBox �示用户输入姓�和地�。
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part1
+
+    \o 我们接�继续检查是��系人已存在。如果�存在，将�系人添加至 \c contacts，然�显示 QMessageBox �示用户已添加�系人。
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part2
+
+    如果�系人已存在，还是会显示 QMessageBox 以�示用户，以�添加��的�系人。由于 \c contacts 对象是基于姓�地�的键-值对，因此�确�键唯一。
+
+    \o 在处�了上述两�情况�，使用以下代�将按钮��为正常状�：
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part3
+
+    \endlist
+
+    下�的�幕截图显示了用于�用户显示�示信�的 QMessageBox 对象。
+
+    \image addressbook-tutorial-part2-add-successful.png
+
+    \c cancel() 函数��上次显示的�系人详细信�，并�用 \c addButton，还会�� \c submitButton 和
+    \c cancelButton。
+
+    \snippet tutorials/addressbook/part2/addressbook.cpp cancel
+
+    添加�系人的总体�想就是�高用户�作的�活性，�在任何时候点击\gui{�交}或\gui{�消}。下�的�程图详细说明了此概念：
+
+    \image addressbook-tutorial-part2-add-flowchart.png
+*/
+
+/*!
+    \page tutorials-addressbook-part3.html
+    \previouspage 地�簿 2 — 添加地�
+    \contentspage {地�簿教程}{目录}
+    \nextpage {tutorials/addressbook/part4}{第四章}
+    \example tutorials/addressbook/part3
+    \title 地�簿 3 — �览地�簿�目
+
+    构建地�簿应用程�现已进展过�。我们需�增加一些函数，以便�览�系人。但首先�决定采用何�数�结构方��储存这些�系人。
+
+    在第二章中，我们使用了 QMap 键-值对，��系人姓�作为\e{键}，而�系人地�作为\e{值}。这�方�很适�我们的实例。�过，��览和显示�个�目，还需�进行一些改进。
+
+    我们改进 QMap 的方�是，将数�结构替�为类似循环链接的列表，其中所有元素都是相互关�的，包括第一个元素和最�一个元素。下图图解说明了该数�结构。
+
+    \image addressbook-tutorial-part3-linkedlist.png
+
+    \section1 定义 AddressBook 类
+
+    �给地�簿应用程�增加�览功能，我们需�为 \c AddressBook 类�增加两个函数：\c next() 和 \c previous()。将这两个函数添加到 \c addressbook.h 文件中：
+
+    \snippet tutorials/addressbook/part3/addressbook.h navigation functions
+
+    我们还需�使用其他两个 QPushButton 对象，因此将 \c nextButton 和 \c previousButton 声明为�有��：
+
+    \snippet tutorials/addressbook/part3/addressbook.h navigation pushbuttons
+
+    \section1 应用 AddressBook 类
+
+    在 \c AddressBook 的 \c addressbook.cpp 构造器中，我们实例化 \c nextButton 和 \c previousButton，并且这两项默认为�用。这是因为仅当地�簿中有多个�系人时�会�用�览功能。
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp navigation pushbuttons
+
+    然�，我们将这两个按钮与其相应的槽关�：
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp connecting navigation signals
+
+    下图�为预期的图形用户界�。请注�，该用户界�已很接近应用程�最终的样�。
+
+    \image addressbook-tutorial-part3-screenshot.png
+
+    我们按照 \c next() 和 \c previous() 函数的基本规范，将 \c nextButton 放置在�侧，而 \c previousButton 放置在左侧。为了使布局更加直观，我们使用 QHBoxLayout 将 widget 并排放置：
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp navigation layout
+
+    然�，将 QHBoxLayout 对象 \c buttonLayout2 增加至 \c mainLayout。
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp adding navigation layout
+
+    下图显示了 widget 在 \c mainLayout 中的�标�置。
+
+    \image addressbook-tutorial-part3-labeled-layout.png
+
+    在 \c addContact() 函数中，我们必须�用这几个按钮，这样用户就�会在增加�系人时�试进行�览。
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp disabling navigation
+
+    此外，在 \c submitContact() 函数中，我们�用了�览按钮 \c nextButton 和 \c previousButton，这�决于 \c contacts 的多少。如上文所述，�览功能仅在地�簿中有多个�系人时�会�用。以下代�行说明了如何实现此功能：
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp enabling navigation
+
+    我们还在 \c cancel() 函数中加入这几行代�。
+
+    记得我们曾使用 QMap 对象 \c contacts 模拟了一个循环链接的列表。因此，在 \c next() 函数中，我们获� \c contacts 的迭代器，然�执行以下�作：
+
+    \list
+        \o 如果迭代器未达到 \c contacts 结尾，就会增加一。
+        \o 如果迭代器已达到 \c contacts 的结尾，就移至 \c contacts 的起始�置。这给人感觉 QMap 就�是一个循环链接的列表。
+    \endlist
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp next() function
+
+    一旦在 \c contacts 中循环至正确的对象，就会通过 \c nameLine 和 \c addressText 显示对象的内容。
+
+    �样，在 \c previous() 函数中，我们获� \c contacts 的迭代器，然�执行以下�作：
+
+    \list
+        \o 如果迭代器达到 \c contacts 的结尾，就清除显示内容，然�返回。
+        \o 如果迭代器在 \c contacts 的起始�置，就将其移至结尾。
+        \o 然�，将迭代器�一。
+    \endlist
+
+    \snippet tutorials/addressbook/part3/addressbook.cpp previous() function
+
+    接�，�新显示 \c contacts 中当�对象的内容。
+*/
+
+/*!
+    \page tutorials-addressbook-part4.html
+    \previouspage 地�簿 3 — �览地�簿�目
+    \contentspage {地�簿教程}{目录}
+    \nextpage {tutorials/addressbook/part5}{第五章}
+    \example tutorials/addressbook/part4
+    \title 地�簿 4 — 编辑和删除地�
+
+    在本章中，我们将了解如何修改储存在地�簿应用程�中的�系人的内容。
+
+    \image addressbook-tutorial-screenshot.png
+
+    现有的地�簿�仅�以井井有�地储存�系人，还�进行�览。�添加上编辑和删除功能，以便在需�时更改�系人的详细信�，这样更易于使用。�过，还需使用 enum 类型进行一些改进。在�几章中，我们使用以下两�模�：\c{AddingMode} 和 \c{NavigationMode}。但是，他们并未定义为 enum。我们是采用手动方��用和�用相应的按钮，这就导致有多行��的代�。
+
+    在本章中，我们定义带有以下三���值的 \c{Mode} enum 类型：
+
+    \list
+        \o \c{NavigationMode}�
+        \o \c{AddingMode} 和
+        \o \c{EditingMode}。
+    \endlist
+
+    \section1 定义 AddressBook 类
+
+    \c addressbook.h 文件已更新为包� Mode \c enum 类型：
+
+    \snippet tutorials/addressbook/part4/addressbook.h Mode enum
+
+    我们还��当�的公有槽列表增加两个新槽：\c editContact() 和 \c removeContact()。
+
+    \snippet tutorials/addressbook/part4/addressbook.h edit and remove slots
+
+    为了在模�间切�，我们引入了 \c updateInterface() 函数�控制所有 QPushButton 对象的�用和�用。�实现上文��的编辑和删除功能，我们还�增加两个新按钮：\c editButton 和 \c removeButton。
+
+    \snippet tutorials/addressbook/part4/addressbook.h updateInterface() declaration
+    \dots
+    \snippet tutorials/addressbook/part4/addressbook.h buttons declaration
+    \dots
+    \snippet tutorials/addressbook/part4/addressbook.h mode declaration
+
+    最�，我们声明 \c currentMode �跟踪 enum 的当�模�。
+
+    \section1 应用 AddressBook 类
+
+    我们现在必须应用地�簿应用程�的模�更改功能。\c editButton 和 \c removeButton 已实例化并默认为�用，这是因为地�簿�动时在内存中没有�系人。
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp edit and remove buttons
+
+    这些按钮会与其相应的槽 \c editContact() 和 \c removeContact() 关�，然�我们将其添加至 \c buttonLayout1。
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp connecting edit and remove
+    \dots
+    \snippet tutorials/addressbook/part4/addressbook.cpp adding edit and remove to the layout
+
+    在将模�切�到 \c EditingMode 之�，\c editContact() 函数使用 \c oldName 和 \c oldAddress 储存�系人旧的详细信�。 在该模�下，\c submitButton 和 \c cancelButton �已�用，这样用户就�以更改�系人的详细信�并�点击任何一个按钮。
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp editContact() function
+
+    \c submitContact() 函数已被 \c{if-else} 语�分为两部分。我们查看 \c currentMode 是�在 \c AddingMode 模�下。如果是，我们继续添加�作。
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp submitContact() function beginning
+    \dots
+    \snippet tutorials/addressbook/part4/addressbook.cpp submitContact() function part1
+
+    �则，我们查看 \c currentMode 是�在 \c EditingMode 模�下。如果是，我们比较 \c oldName 和 \c name。如果姓�已更改，我们从 \c contacts 中删除旧的�系人并�入已更新的�系人。
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp submitContact() function part2
+
+    如果仅更改了地�（例如 \c oldAddress 与 \c address ��），我们就更新�系人的地�。最�，我们将 \c currentMode 设置为 \c NavigationMode。这一步至关��，因为它会�新�用所有已�用的按钮。
+
+    �从地�簿中删除�系人，我们采用 \c removeContact() 函数。该函数查看 \c contacts 中是�包�该�系人。
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp removeContact() function
+
+    如果有，我们显示 QMessageBox，确认用户的删除�作。一旦用户确认�作，我们调用 \c previous() 确�用户界�显示其他�系人，然�我们使用 QMap 的 \l{QMap::remove()}{remove()} 函数删除已已确认的�系人。出于好�，我们会显示 QMessageBox �示用户。在该函数中使用两�信�框显示如下：
+
+    \image addressbook-tutorial-part4-remove.png
+
+    \section2 更新用户界�
+
+    我们在上文�到 \c updateInterface() 函数，它�根�当�的模��用和�用按钮。该函数会根�传递给它的 \c mode �数更新当�的模�，在校验值之�将�数分�给 \c currentMode。
+
+    这样，�个按钮就根�当�的模�进行�用或�用。\c AddingMode 和 \c EditingMode 的代�显示如下：
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp update interface() part 1
+
+    �过对于 \c NavigationMode，我们在 QPushButton::setEnabled() 函数的�数中加入了�件。这样�确� \c editButton 和 \c removeButton 在地�簿中至少有一个�系人的情况下�用，而 \c nextButton 和 \c previousButton 仅在地�簿中有多个�系人时��用。
+
+    \snippet tutorials/addressbook/part4/addressbook.cpp update interface() part 2
+
+    通过在�一函数中设置模�和更新用户界�，我们�以��用户界�与应用程�内部状���步的�能性。
+*/
+
+/*!
+    \page tutorials-addressbook-part5.html
+    \previouspage 地�簿 4 — 编辑和删除地�
+    \contentspage {地�簿教程}{目录}
+    \nextpage {tutorials/addressbook/part6}{第六章}
+    \example tutorials/addressbook/part5
+    \title 地�簿 5 — 添加查找功能
+
+    在本章中，我们将了解如何在地�簿应用程�中定��系人和地�。
+
+    \image addressbook-tutorial-part5-screenshot.png
+
+    ��我们�断为地�簿应用程�添加�系人，使用下一个和上一个按钮�览�系人就会�得很��。在这�情况下，使用查找函数查找�系人就会更加有效。上�的�幕截图显示了查找按钮�其在按钮��上的�置。
+
+    当用户点击查找按钮时，有必�显示一个对�框，用户�在其中输入�系人的姓�。Qt �供了 QDialog（我们会在本章中将其用作�类），�使用 \c FindDialog 类。
+
+    \section1 定义 FindDialog 类
+
+    \image addressbook-tutorial-part5-finddialog.png
+
+    �使用 QDialog 的�类，我们首先�在 \c finddialog.h 文件中声明 QDialog 的头信�。此外，我们还使用�� (forward) 声明�声明 QLineEdit 和 QPushButton，这样我们就能在对�框类中使用这些 widget。
+
+    因为在 \c AddressBook 类中，\c FindDialog 类包�了 Q_OBJECT �，并且其构造器已定义为接收父级 QWidget，�使对�框以�独的窗�方�打开。
+
+    \snippet tutorials/addressbook/part5/finddialog.h FindDialog header
+
+    我们定义了公有函数 \c getFindText()，供实例化 \c FindDialog 的类使用，这样这些类�以获�用户输入的文本。公有槽 \c findClicked() 定义为在用户点击\gui{查找}按钮时处��索字符串。
+
+    最�，我们定义�有�� \c findButton�\c lineEdit 和 \c findText，分别对应\gui{查找}按钮�用户输入�索字符串的行编辑框和储存�索字符串供��使用的内部字符串。
+
+    \section1 应用 FindDialog 类
+
+    在 \c FindDialog 的构造器中，我们设置�有�� \c lineEdit�\c findButton 和 \c findText。使用 QHBoxLayout 放置 widget。
+
+    \snippet tutorials/addressbook/part5/finddialog.cpp constructor
+
+    我们设定布局和窗�标题，并将信�与其�自的槽关�。请注�，\c findButton 的 \l{QPushButton::clicked()}{clicked()} 信�已与 \c findClicked() 和 \l{QDialog::accept()}{accept()} 关�。QDialog �供的 \l{QDialog::accept()}{accept()} 槽会��对�框并将结果代�设置为 \l{QDialog::}{Accepted}。我们使用该函数有助于 \c AddressBook 的 \c findContact() 函数知晓 \c FindDialog 对象关闭的时间。我们在讨论 \c findContact() 函数时将对该函数�进一步说明。
+
+    \image addressbook-tutorial-part5-signals-and-slots.png
+
+    在 \c findClicked() 中，我们验� \c lineEdit 以确�用户没有在尚未输入�系人姓�时就点击\gui{查找}按钮。然�，我们将 \c findText 设置为从 \c lineEdit ��的�索字符串。之�，我们清空 \c lineEdit 的内容并��对�框。
+
+    \snippet tutorials/addressbook/part5/finddialog.cpp findClicked() function
+
+    \c findText ��已有公有 getter 函数 \c getFindText() 与其相关�。既然我们仅在构造器和 \c findClicked() 函数中直接设定了 \c findText， 我们就�在创建 \c getFindText() 的�时�创建 setter 函数。由于 \c getFindText() 是公有的，实例化和使用 \c FindDialog 的类�始终读�用户已输入并确认的�索字符串。
+
+    \snippet tutorials/addressbook/part5/finddialog.cpp getFindText() function
+
+    \section1 定义 AddressBook 类
+
+    �确�我们�使用 \c AddressBook 类中的 \c FindDialog，我们�在 \c addressbook.h 文件中包� \c finddialog.h。
+
+    \snippet tutorials/addressbook/part5/addressbook.h include finddialog's header
+
+    至此，所有地�簿功能都有了 QPushButton 和对应的槽。�样，\gui{Find} 功能有 \c findButton 和 \c findContact()。
+
+    \c findButton 声明为�有��，而 \c findContact() 函数声明为公有槽。
+
+    \snippet tutorials/addressbook/part5/addressbook.h findContact() declaration
+    \dots
+    \snippet tutorials/addressbook/part5/addressbook.h findButton declaration
+
+    最�，我们声明�有�� \c dialog，用于引用 \c FindDialog 的实例。
+
+    \snippet tutorials/addressbook/part5/addressbook.h FindDialog declaration
+
+    在实例化对�框�，我们�能会对其进行多次使用。使用�有���在类中���置对其进行多次引用。
+
+    \section1 应用 AddressBook 类
+
+    在 \c AddressBook 类的构造器中，实例化�有对象 \c findButton 和 \c findDialog：
+
+    \snippet tutorials/addressbook/part5/addressbook.cpp instantiating findButton
+    \dots
+    \snippet tutorials/addressbook/part5/addressbook.cpp instantiating FindDialog
+
+    接下�，将 \c findButton 的 \l{QPushButton::clicked()}{clicked()} 信�与 \c findContact() 关�。
+
+    \snippet tutorials/addressbook/part5/addressbook.cpp signals and slots for find
+
+    现在唯一�完�的就是 \c findContact() 函数的编�：
+
+    \snippet tutorials/addressbook/part5/addressbook.cpp findContact() function
+
+    我们从显示 \c FindDialog 的实例 \c dialog 开始入手。这时用户开始输入�系人姓�进行查找。用户点击对�框的 \c findButton �，对�框会��，并且结果代�设置为 QDialog::Accepted.这样就确�了 \c if 语�始终为真。
+
+    然�，我们就开始使用 \c FindDialog 的 \c getFindText() 函数���索字符串，这个字符串也就是本例中的 \c contactName。如果地�簿中有�系人，就立�显示该�系人。�则，显示如下所示的 QMessageBox 表明�索失败。
+
+    \image addressbook-tutorial-part5-notfound.png
+*/
+
+/*!
+    \page tutorials-addressbook-part6.html
+    \previouspage 地�簿 5 — 添加查找功能
+    \contentspage {地�簿教程}{目录}
+    \nextpage {tutorials/addressbook/part7}{第七章}
+    \example tutorials/addressbook/part6
+    \title 地�簿 6 — 加载和�存
+
+    本章�述了用于编写地�簿应用程�的加载和�存程�所使用的 Qt 文件处�功能。
+
+    \image addressbook-tutorial-part6-screenshot.png
+
+    虽然�览和�索�系人是�常实用的功能，但�有在�以�存现有�系人并�以在以�加载的��下地�簿�真正完全�用。Qt �供大�用于\l{Input/Output and Networking}{输入和输出}的类，但我们�选择两个易于�并使用的类：QFile 和 QDataStream。
+
+    QFile 对象表示�盘上�读�和写入的文件。QFile 是代表多���设备且应用更广的 QIODevice 类的�类。
+
+    QDataStream 对象用于按顺�排列二进制数�，以便储存在 QIODevice 中并供以�检索。读�或写入 QIODevice 就如�打开数��，然�读�或写入一样简�，�是�数为��的设备。
+
+
+    \section1 定义 AddressBook 类
+
+    我们声明两个公有槽 \c saveToFile() 和 \c loadFromFile()，以�两个 QPushButton 对象 \c loadButton 和 \c saveButton。
+
+    \snippet tutorials/addressbook/part6/addressbook.h save and load functions declaration
+    \dots
+    \snippet tutorials/addressbook/part6/addressbook.h save and load buttons declaration
+
+    \section1 应用 AddressBook 类
+
+    在构造器中，我们实例化 \c loadButton 和 \c saveButton。�想情况下，将按钮标签设置为“从文件加载�系人�和“将�系人�存至文件�会更方便用户使用。�过，由于其他按钮的大��制，我们将标签设置为\gui{加载...}和\gui{�存...}。幸�的是，Qt �供了使用 \l{QWidget::setToolTip()}{setToolTip()} �设置工具�示的简�方�，我们�通过如下方�将其用于按钮：
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp tooltip 1
+    \dots
+    \snippet tutorials/addressbook/part6/addressbook.cpp tooltip 2
+
+    虽然此处没有显示，但与其他应用的功能一样，我们在�侧的布局�� \c button1Layout 上添加按钮，然�将按钮的 \l{QPushButton::clicked()}{clicked()} 信�与其相应的槽关�。
+
+    至于�存功能，我们首先使用 QFileDialog::getSaveFileName() 获� \c fileName。 这是 QFileDialog �供的一个便�功能，�弹出样�文件对�框并�许用户输入文件�或选择现有的 \c{.abk} 文件。\c{.abk} 文件是�存�系人时创建的地�簿扩展�。
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp saveToFile() function part1
+
+    弹出的文件对�框�幕截图显示如下：
+
+    \image addressbook-tutorial-part6-save.png
+
+    如果 \c fileName �为空，我们就使用 \c fileName 创建 QFile 对象 \c file。 QFile 与 QDataStream 一�使用，这是因为QFile 是 QIODevice。
+
+    接下�，我们�试以 \l{QIODevice::}{WriteOnly} 模�打开文件。如果未能打开，会显示 QMessageBox �示用户。
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp saveToFile() function part2
+
+    �则，会用实例表示 QDataStream 对象 \c out，以写入打开的文件。QDataStream �求读写�作需使用相�版本的数��。在将数�按顺�写入 \c file 之�，将使用的版本设置为\l{QDataStream::Qt_4_5}{采用 Qt 4.5 的版本}就�确�版本相�。
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp saveToFile() function part3
+
+    至于加载功能，我们也是使用 QFileDialog::getOpenFileName() 获� \c fileName。该函数与 QFileDialog::getSaveFileName() 相对应，也是弹出样�文件对�框并�许用户输入文件�或选择现有的 \c{.abk} 文件加载到地�簿中。
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp loadFromFile() function part1
+
+    例如，在 Windows 上，该函数弹出本地文件对�框，如以下�幕截图所示。
+
+    \image addressbook-tutorial-part6-load.png
+
+    如果 \c fileName �为空，还是使用 QFile 对象 \c file，然��试在 \l{QIODevice::}{ReadOnly} 模�下打开文件。与 \c saveToFile() 的应用方�类似，如果�试失败，会显示 QMessageBox �示用户。
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp loadFromFile() function part2
+
+    �则，会用实例表示 QDataStream 对象 \c in，按上文所述设置其版本，然�将按顺�排列的数�读入 \c contacts 数�结构。请注�，在将数�读入之�清空 \c contacts �简化文件读�过程。更高级的方法是将�系人读�至临时 QMap 对象，然�仅�制 \c contacts 中�存在的�系人。
+
+    \snippet tutorials/addressbook/part6/addressbook.cpp loadFromFile() function part3
+
+    �显示从文件中读�的�系人，必须�先验�获�的数�，以确�读�的文件实际包�地�簿�系人。如果为真，显示第一个�系人，�则显示 QMessageBox �示出现问题。最�，我们更新界�以相应地�用和�用按钮。
+*/
+
+/*!
+    \page tutorials-addressbook-part7.html
+    \previouspage 地�簿 6 — 加载和�存
+    \contentspage {地�簿教程}{目录}
+    \example tutorials/addressbook/part7
+    \title 地�簿 7 — 附加功能
+
+    本章讲述了部分�使地�簿应用程�日常使用更加便�的附加功能。
+
+    \image addressbook-tutorial-part7-screenshot.png
+
+    虽然地�簿应用程�其自身功能已�很实用，但是如果�和其他应用程�互��系人数�就会更加有益。vCard 格�是一��行的文件格�，就�用于此目的。在本章中，我们会扩展地�簿客户端，�将�系人导出到 vCard \c{.vcf} 文件中。
+
+    \section1 定义 AddressBook 类
+
+    我们在 \c addressbook.h 文件的 \c AddressBook 类中添加 QPushButton 对象 \c exportButton 以�对应的公有槽 \c exportAsVCard()。
+
+    \snippet tutorials/addressbook/part7/addressbook.h exportAsVCard() declaration
+    \dots
+    \snippet tutorials/addressbook/part7/addressbook.h exportButton declaration
+
+    \section1 应用 AddressBook 类
+
+    在 \c AddressBook 构造器中，我们将 \c exportButton 的 \l{QPushButton::clicked()}{clicked()} 信�连接至 \c exportAsVCard()。我们还会将该按钮添加至 \c buttonLayout1，它是负责�侧按钮��的布局类。
+
+    在 \c exportAsVCard() 函数中，我们从�� \c name 中�系人姓�开始入手。我们声明 \c firstName�\c lastName 和 \c nameList。接下�，我们查找 \c name 中第一处空白的索引。如果有空白，就将�系人的姓�分隔为 \c firstName 和 lastName。然�，将空白替�为下划线 ("_")。或者，如果没有空白，就认定�系人�有�字。
+
+    \snippet tutorials/addressbook/part7/addressbook.cpp export function part1
+
+    至于 \c saveToFile() 函数，会打开文件对�框，让用户选择文件的�置。通过选择的文件�称，我们创建�写入的 QFile 实例。
+
+    我们�试以 \l{QIODevice::}{WriteOnly} 模�打开文件。如果�作失败，会显示 QMessageBox �示用户出现问题并返回。�则，将文件作为�数传递给 QTextStream 对象 \c out。与 QDataStream 类似，QTextStream 类�供了读�纯文本和将其写入到文件的功能。因此，所生�的 \c{.vcf} 文件�以在文本编辑器中打开进行编辑。
+
+    \snippet tutorials/addressbook/part7/addressbook.cpp export function part2
+
+    然�，我们写出�次带有 \c{BEGIN:VCARD} 和 \c{VERSION:2.1} 标记的 vCard 文件。�系人的姓�使用 \c{N:} 标记写入。至于写入 vCard “File as�属性的 FN: 标记，我们必须�查看是��系人带有姓。如果�系人有姓，就使用 \c nameList 中的详细信�填入该标记。�则，仅写入 \c firstName。
+
+    \snippet tutorials/addressbook/part7/addressbook.cpp export function part3
+
+    我们继续写入�系人的地�。地�中的分�使用 "\\" 进行转义，新行使用分�进行替�，而逗�使用空白进行替�。最�，我们�次写入 \c{ADR;HOME:;}�\c address 和 \c{END:VCARD} 标记。
+
+    \snippet tutorials/addressbook/part7/addressbook.cpp export function part4
+
+    最�，会显示 QMessageBox �示用户已�功导出 vCard。
+
+    \e{vCard 是 \l{http://www.imc.org}{Internet Mail Consortium} 的商标}。
+*/
diff --git a/doc/src/zh_CN/tutorials/widgets-tutorial.qdoc b/doc/src/zh_CN/tutorials/widgets-tutorial.qdoc
new file mode 100644
index 0000000..90ef4f3
--- /dev/null
+++ b/doc/src/zh_CN/tutorials/widgets-tutorial.qdoc
@@ -0,0 +1,244 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page widgets-tutorial.html
+    \title Widgets 教程
+    \brief This tutorial covers basic usage of widgets and layouts, showing how
+    they are used to build GUI applications.
+
+    \startpage {index.html}{Qt Reference Documentation}
+    \contentspage 教程
+    \nextpage {Widgets 教程 — 创建窗�}
+
+
+    \section1 简介
+
+    Widget 是使用 Qt 编写的图形用户界� (GUI) 应用程�的基本生��。�个 GUI 组件，如按钮�标签或文本编辑器，都是一个 widget ，并�以放置在现有的用户界�中或作为�独的窗�显示。��类型的组件都是由 QWidget 的特殊�类�供的，而 QWidget 自身�是 QObject 的�类。
+
+    QWidget �是一个抽象类；它�用作其他 widget 的容器，并很容易作为�类使用�创建定制 widget。它�常用�创建放置其他 widget 的窗�。
+
+    至于 QObject，�使用父对象创建 widget 以表明其所属关系，这�确�删除��使用的对象。使用 widget，这些父�关系就有了更多的�义：�个�类都显示在其父级所拥有的�幕区域内。也就是说，当删除窗�时，其包�的所有 widget 也都自动删除。
+
+    \section1 Writing a main Function
+
+    Many of the GUI examples in Qt follow the pattern of having a \c{main.cpp}
+    file containing code to initialize the application, and a number of other
+    source and header files containing the application logic and custom GUI
+    components.
+
+    A typical \c main() function, written in \c{main.cpp}, looks like this:
+
+    \snippet doc/src/snippets/widgets-tutorial/template.cpp main.cpp body
+
+    We first construct a QApplication object which is configured using any
+    arguments passed in from the command line. After any widgets have been
+    created and shown, we call QApplication::exec() to start Qt's event loop.
+    Control passes to Qt until this function returns, at which point we return
+    the value we obtain from this function.
+
+    In each part of this tutorial, we provide an example that is written
+    entirely within a \c main() function. In more sophisticated examples, the
+    code to set up widgets and layouts is written in other parts of the
+    example. For example, the GUI for a main window may be set up in the
+    constructor of a QMainWindow subclass.
+
+    The \l{Widgets examples} are a good place to look for
+    more complex and complete examples and applications.
+
+    \section1 Building Examples and Tutorials
+
+    If you obtained a binary package of Qt or compiled it yourself, the
+    examples described in this tutorial should already be ready to run.
+    However, if you may wish to modify them and recompile them, you need to
+    perform the following steps:
+
+    \list 1
+    \o At the command line, enter the directory containing the example you
+       wish to recompile.
+    \o Type \c qmake and press \key{Return}. If this doesn't work, make sure
+       that the executable is on your path, or enter its full location.
+    \o On Linux/Unix and Mac OS X, type \c make and press \key{Return};
+       on Windows with Visual Studio, type \c nmake and press \key{Return}.
+    \endlist
+
+    An executable file should have been created within the current directory.
+    On Windows, this file may be located within a \c debug or \c release
+    subdirectory. You can run this file to see the example code at work.
+*/
+
+/*!
+    \page widgets-tutorial-toplevel.html
+    \contentspage {Widgets 教程}{目录}
+    \previouspage {Widgets 教程}
+    \nextpage {Widgets 教程 — Child Widgets}
+    \example tutorials/widgets/toplevel
+    \title Widgets 教程 — 创建窗�
+
+    如果 widget 未使用父级进行创建，则在显示时视为窗�或\e{顶层 widget}。由于顶层 widget 没有父级对象类�确�在其��使用时就删除，因此需�开�人员在应用程�中对其进行跟踪。
+
+    在下例中，我们使用 QWidget 创建和显示具有默认大�的窗�：
+
+    \raw HTML
+    <table align="left" width="100%">
+    <tr class="qt-code"><td>
+    \endraw
+    \snippet tutorials/widgets/toplevel/main.cpp main program
+    \raw HTML
+    </td><td align="right">
+    \endraw
+    \inlineimage widgets-tutorial-toplevel.png
+    \raw HTML
+    </td></tr>
+    </table>
+    \endraw
+
+    To create a real GUI, we need to place widgets inside the window. To do
+    this, we pass a QWidget instance to a widget's constructor, as we will
+    demonstrate in the next part of this tutorial.
+*/
+
+/*!
+    \page widgets-tutorial-childwidget.html
+    \contentspage {Widgets 教程}{目录}
+    \previouspage {Widgets 教程 — 创建窗�}
+    \nextpage {Widgets 教程 — 使用布局}
+    \example tutorials/widgets/childwidget
+    \title Widgets 教程 — Child Widgets
+
+    我们�以通过将 \c window 作为父级传递给其构造器��窗�添加� widget。在这�情况下，我们�窗�添加按钮并将其放置在特定�置：
+
+    \raw HTML
+    <table align="left" width="100%">
+    <tr class="qt-code"><td>
+    \endraw
+    \snippet tutorials/widgets/childwidget/main.cpp main program
+    \raw HTML
+    </td><td align="right">
+    \endraw
+    \inlineimage widgets-tutorial-childwidget.png
+    \raw HTML
+    </td></tr>
+    </table>
+    \endraw
+
+    该按钮现在为窗�的�项，并在删除窗�时一�删除。请注�，��或关闭窗��会自动删除该按钮。
+*/
+
+/*!
+    \page widgets-tutorial-windowlayout.html
+    \contentspage {Widgets 教程}{目录}
+    \previouspage {Widgets 教程 — Child Widgets}
+    \nextpage {Widgets 教程 — Nested Layouts}
+    \example tutorials/widgets/windowlayout
+    \title Widgets 教程 — 使用布局
+
+    通常，� widget 是通过使用布局对象在窗�中进行排列，而�是通过指定�置和大�进行排列。在此处，我们构造�并排排列的标签和行编辑框 widget。
+
+    \raw HTML
+    <table align="left" width="100%">
+    <tr class="qt-code"><td>
+    \endraw
+    \snippet tutorials/widgets/windowlayout/main.cpp main program
+    \raw HTML
+    </td><td align="right">
+    \endraw
+    \inlineimage widgets-tutorial-windowlayout.png
+    \raw HTML
+    </td></tr>
+    </table>
+    \endraw
+
+    我们构造的布局对象管�通过 \l{QHBoxLayout::}{addWidget()} 函数�供的 widget 的�置和大�。布局本身是通过调用 \l{QWidget::}{setLayout()} �供给窗�的。布局仅�通过其对所管�的 widget（和其他布局）的效果��显示。
+
+    在上文示例中，�个 widget 的所属关系并�明显。由于我们未使用父级对象构造 widget 和布局，我们会看到一个空窗�和两个包�了标签与行编辑框的窗�。�过，如果我们告知布局�管�标签和行编辑框，并在窗�中设置布局，两个 widget 与布局本身就都会�为窗�的�项。
+*/
+
+/*!
+    \page widgets-tutorial-nestedlayouts.html
+    \contentspage {Widgets 教程}{目录}
+    \previouspage {Widgets 教程 — 使用布局}
+    \example tutorials/widgets/nestedlayouts
+    \title Widgets 教程 — Nested Layouts
+
+    由于 widget �包�其他 widget，布局�用��供按��层次分组的 widget。这里，我们�在显示查询结果的表视图上方�窗�顶部的行编辑框�，显示一个标签。
+
+    We achieve this by creating two layouts: \c{queryLayout} is a QHBoxLayout
+    that contains QLabel and QLineEdit widgets placed side-by-side;
+    \c{mainLayout} is a QVBoxLayout that contains \c{queryLayout} and a
+    QTableView arranged vertically.
+
+    \raw HTML
+    <table align="left" width="100%">
+    <tr class="qt-code"><td>
+    \endraw
+    \snippet tutorials/widgets/nestedlayouts/main.cpp first part
+    \snippet tutorials/widgets/nestedlayouts/main.cpp last part
+    \raw HTML
+    </td><td align="right">
+    \endraw
+    \inlineimage widgets-tutorial-nestedlayouts.png
+    \raw HTML
+    </td></tr>
+    </table>
+    \endraw
+
+    Note that we call the \c{mainLayout}'s \l{QBoxLayout::}{addLayout()}
+    function to insert the \c{queryLayout} above the \c{resultView} table.
+
+    We have omitted the code that sets up the model containing the data shown
+    by the QTableView widget, \c resultView. For completeness, we show this below.
+
+    除了 QHBoxLayout 和 QVBoxLayout，Qt 还�供了 QGridLayout 和 QFormLayout 类��助实现更��的用户界�。
+    These can be seen if you run \l{Qt Designer}.
+
+    \section1 Setting up the Model
+
+    In the code above, we did not show where the table's data came from
+    because we wanted to concentrate on the use of layouts. Here, we see
+    that the model holds a number of items corresponding to rows, each of
+    which is set up to contain data for two columns.
+
+    \snippet tutorials/widgets/nestedlayouts/main.cpp set up the model
+
+    The use of models and views is covered in the
+    \l{Item Views Examples} and in the \l{Model/View Programming} overview.
+*/
diff --git a/mkspecs/common/posix/qplatformdefs.h b/mkspecs/common/posix/qplatformdefs.h
index e29bc6f..6310257 100644
--- a/mkspecs/common/posix/qplatformdefs.h
+++ b/mkspecs/common/posix/qplatformdefs.h
@@ -138,7 +138,9 @@
 #define QT_OPENDIR              ::opendir
 #define QT_CLOSEDIR             ::closedir
 
-#if defined(QT_USE_XOPEN_LFS_EXTENSIONS) && defined(QT_LARGEFILE_SUPPORT)
+#if defined(QT_LARGEFILE_SUPPORT) \
+        && defined(QT_USE_XOPEN_LFS_EXTENSIONS) \
+        && !defined(QT_NO_READDIR64)
 #define QT_DIRENT               struct dirent64
 #define QT_READDIR              ::readdir64
 #define QT_READDIR_R            ::readdir64_r
diff --git a/mkspecs/hpux-acc-64/qplatformdefs.h b/mkspecs/hpux-acc-64/qplatformdefs.h
index f9789a8..c1a9ab8 100644
--- a/mkspecs/hpux-acc-64/qplatformdefs.h
+++ b/mkspecs/hpux-acc-64/qplatformdefs.h
@@ -77,6 +77,7 @@
 #endif
 
 #define QT_USE_XOPEN_LFS_EXTENSIONS
+#define QT_NO_READDIR64
 #include "../common/posix/qplatformdefs.h"
 
 #undef QT_OPEN_LARGEFILE
diff --git a/mkspecs/hpux-acc-o64/qplatformdefs.h b/mkspecs/hpux-acc-o64/qplatformdefs.h
index 5237806..c622d80 100644
--- a/mkspecs/hpux-acc-o64/qplatformdefs.h
+++ b/mkspecs/hpux-acc-o64/qplatformdefs.h
@@ -78,6 +78,7 @@
 #endif
 
 #define QT_USE_XOPEN_LFS_EXTENSIONS
+#define QT_NO_READDIR64
 #include "../common/posix/qplatformdefs.h"
 
 #undef QT_SOCKLEN_T
diff --git a/mkspecs/hpux-acc/qplatformdefs.h b/mkspecs/hpux-acc/qplatformdefs.h
index 9ce08c6..c18ad49 100644
--- a/mkspecs/hpux-acc/qplatformdefs.h
+++ b/mkspecs/hpux-acc/qplatformdefs.h
@@ -80,6 +80,7 @@
 #endif
 
 #define QT_USE_XOPEN_LFS_EXTENSIONS
+#define QT_NO_READDIR64
 #include "../common/posix/qplatformdefs.h"
 
 #undef QT_OPEN_LARGEFILE
diff --git a/mkspecs/hpux-g++-64/qplatformdefs.h b/mkspecs/hpux-g++-64/qplatformdefs.h
index f3fbda5..e9a9e75 100644
--- a/mkspecs/hpux-g++-64/qplatformdefs.h
+++ b/mkspecs/hpux-g++-64/qplatformdefs.h
@@ -77,6 +77,7 @@
 #endif
 
 #define QT_USE_XOPEN_LFS_EXTENSIONS
+#define QT_NO_READDIR64
 #include "../common/posix/qplatformdefs.h"
 
 #endif // QPLATFORMDEFS_H
diff --git a/mkspecs/hpux-g++/qplatformdefs.h b/mkspecs/hpux-g++/qplatformdefs.h
index 38e9408..9296ac2 100644
--- a/mkspecs/hpux-g++/qplatformdefs.h
+++ b/mkspecs/hpux-g++/qplatformdefs.h
@@ -79,6 +79,7 @@
 #endif
 
 #define QT_USE_XOPEN_LFS_EXTENSIONS
+#define QT_NO_READDIR64
 #include "../common/posix/qplatformdefs.h"
 
 #undef QT_SOCKLEN_T
diff --git a/mkspecs/hpuxi-acc-32/qplatformdefs.h b/mkspecs/hpuxi-acc-32/qplatformdefs.h
index a0d2464..6aafed2 100644
--- a/mkspecs/hpuxi-acc-32/qplatformdefs.h
+++ b/mkspecs/hpuxi-acc-32/qplatformdefs.h
@@ -78,6 +78,7 @@
 #endif
 
 #define QT_USE_XOPEN_LFS_EXTENSIONS
+#define QT_NO_READDIR64
 #include "../common/posix/qplatformdefs.h"
 
 #undef QT_OPEN_LARGEFILE
diff --git a/mkspecs/hpuxi-acc-64/qplatformdefs.h b/mkspecs/hpuxi-acc-64/qplatformdefs.h
index a0d2464..6aafed2 100644
--- a/mkspecs/hpuxi-acc-64/qplatformdefs.h
+++ b/mkspecs/hpuxi-acc-64/qplatformdefs.h
@@ -78,6 +78,7 @@
 #endif
 
 #define QT_USE_XOPEN_LFS_EXTENSIONS
+#define QT_NO_READDIR64
 #include "../common/posix/qplatformdefs.h"
 
 #undef QT_OPEN_LARGEFILE
diff --git a/mkspecs/hpuxi-g++-64/qplatformdefs.h b/mkspecs/hpuxi-g++-64/qplatformdefs.h
index 288a331..f6789ee 100644
--- a/mkspecs/hpuxi-g++-64/qplatformdefs.h
+++ b/mkspecs/hpuxi-g++-64/qplatformdefs.h
@@ -77,6 +77,7 @@
 #endif
 
 #define QT_USE_XOPEN_LFS_EXTENSIONS
+#define QT_NO_READDIR64
 #include "../common/posix/qplatformdefs.h"
 
 #undef QT_OPEN_LARGEFILE
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 99447a9..02a29d9 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -2543,6 +2543,11 @@ void MetaObjectGenerator::readFuncsInfo(ITypeInfo *typeinfo, ushort nFuncs)
                     break;
             }
             if (funcdesc->invkind == INVOKE_PROPERTYPUT) {
+                // remove the typename guessed for property setters
+                // its done only for setter's with more than one parameter.
+                if (funcdesc->cParams - funcdesc->cParamsOpt > 1) {
+                    type.clear();
+                }
                 QByteArray set;
                 if (isupper(prototype.at(0))) {
                     set = "Set";
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index f5d803e..7cfdddf 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -89,8 +89,6 @@ public:
     QDirPrivate(const QDir *copy = 0);
     ~QDirPrivate();
 
-    QString initFileEngine(const QString &file);
-
     void updateFileLists() const;
     void sortFileList(QDir::SortFlags, QFileInfoList &, QStringList *, QFileInfoList *) const;
 
@@ -146,6 +144,7 @@ public:
     } *data;
     inline void setPath(const QString &p)
     {
+        detach(false);
         QString path = p;
         if ((path.endsWith(QLatin1Char('/')) || path.endsWith(QLatin1Char('\\')))
                 && path.length() > 1) {
@@ -155,8 +154,12 @@ public:
                 path.truncate(path.length() - 1);
         }
 
+        delete data->fileEngine;
+        data->fileEngine = QAbstractFileEngine::create(path);
+
         // set the path to be the qt friendly version so then we can operate on it using just /
-        data->path = initFileEngine(path);
+        data->path = data->fileEngine->fileName(QAbstractFileEngine::DefaultName);
+        data->clear();
     }
     inline void reset() {
         detach();
@@ -310,15 +313,6 @@ inline void QDirPrivate::updateFileLists() const
     }
 }
 
-inline QString QDirPrivate::initFileEngine(const QString &path)
-{
-    detach(false);
-    data->clear();
-    delete data->fileEngine;
-    data->fileEngine = QAbstractFileEngine::create(path);
-    return data->fileEngine->fileName(QAbstractFileEngine::DefaultName);
-}
-
 void QDirPrivate::detach(bool createFileEngine)
 {
     qAtomicDetach(data);
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
index 9ea05b2..7168e05 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -196,6 +196,8 @@ DEFINEFUNC(void  , dbus_free, (void  *memory), (memory), )
 /* dbus-message.h */
 DEFINEFUNC(DBusMessage* , dbus_message_copy, (const DBusMessage *message),
            (message), return)
+DEFINEFUNC(dbus_bool_t   , dbus_message_get_auto_start, (DBusMessage   *message),
+           (message), return)
 DEFINEFUNC(const char*   , dbus_message_get_error_name, (DBusMessage   *message),
            (message), return)
 DEFINEFUNC(const char*   , dbus_message_get_interface, (DBusMessage   *message),
@@ -268,6 +270,9 @@ DEFINEFUNC(DBusMessage* , dbus_message_new_signal, (const char  *path,
            (path, interface, name), return)
 DEFINEFUNC(DBusMessage*  , dbus_message_ref, (DBusMessage   *message),
            (message), return)
+DEFINEFUNC(void          , dbus_message_set_auto_start, (DBusMessage   *message,
+                                                         dbus_bool_t    auto_start),
+           (message, auto_start), return)
 DEFINEFUNC(dbus_bool_t   , dbus_message_set_destination, (DBusMessage   *message,
                                                           const char    *destination),
            (message, destination), return)
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp
index 83b5503..79c7644 100644
--- a/src/dbus/qdbusmessage.cpp
+++ b/src/dbus/qdbusmessage.cpp
@@ -63,7 +63,7 @@ static inline const char *data(const QByteArray &arr)
 QDBusMessagePrivate::QDBusMessagePrivate()
     : msg(0), reply(0), type(DBUS_MESSAGE_TYPE_INVALID),
       timeout(-1), localReply(0), ref(1), delayedReply(false), localMessage(false),
-      parametersValidated(false)
+      parametersValidated(false), autoStartService(true)
 {
 }
 
@@ -129,6 +129,7 @@ DBusMessage *QDBusMessagePrivate::toDBusMessage(const QDBusMessage &message, QDB
 
         msg = q_dbus_message_new_method_call(data(d_ptr->service.toUtf8()), d_ptr->path.toUtf8(),
                                              data(d_ptr->interface.toUtf8()), d_ptr->name.toUtf8());
+        q_dbus_message_set_auto_start( msg, d_ptr->autoStartService );
         break;
     case DBUS_MESSAGE_TYPE_METHOD_RETURN:
         msg = q_dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN);
@@ -644,6 +645,46 @@ bool QDBusMessage::isDelayedReply() const
 }
 
 /*!
+    Sets whether this message will have the auto start flag.
+    This flag only makes sense for method call messages. For
+    these messages it tells the D-Bus server to either auto
+    start the service responsible for the service name, or
+    not to auto start it.
+
+    By default this flag is true, i.e. a service is autostarted.
+    This means:
+
+    When the service that this method call is sent to is already
+    running, the method call is sent to it. If the service is not
+    running yet, the D-Bus daemon is requested to autostart the
+    service that is assigned to this service name. This is
+    handled by .service files that are placed in a directory known
+    to the D-Bus server. These files then each contain a service
+    name and the path to a program that should be executed when
+    this service name is requested.
+
+    \since 4.7
+*/
+void QDBusMessage::setAutoStartService(bool enable)
+{
+    d_ptr->autoStartService = enable;
+}
+
+/*!
+    Returns the auto start flag, as set by setAutoStartService(). By default, this
+    flag is true, which means QtDBus will auto start a service, if it is
+    not running already.
+
+    \sa setAutoStartService()
+
+    \since 4.7
+*/
+bool QDBusMessage::autoStartService() const
+{
+    return d_ptr->autoStartService;
+}
+
+/*!
     Sets the arguments that are going to be sent over D-Bus to \a arguments. Those
     will be the arguments to a method call or the parameters in the signal.
 
diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h
index 1a85983..6df5215 100644
--- a/src/dbus/qdbusmessage.h
+++ b/src/dbus/qdbusmessage.h
@@ -104,6 +104,9 @@ public:
     void setDelayedReply(bool enable) const;
     bool isDelayedReply() const;
 
+    void setAutoStartService(bool enable);
+    bool autoStartService() const;
+
     void setArguments(const QList<QVariant> &arguments);
     QList<QVariant> arguments() const;
 
diff --git a/src/dbus/qdbusmessage_p.h b/src/dbus/qdbusmessage_p.h
index 6bf5448..b6da4a5 100644
--- a/src/dbus/qdbusmessage_p.h
+++ b/src/dbus/qdbusmessage_p.h
@@ -85,6 +85,7 @@ public:
     mutable uint delayedReply : 1;
     uint localMessage : 1;
     mutable uint parametersValidated : 1;
+    uint autoStartService : 1;
 
     static void setParametersValidated(QDBusMessage &msg, bool enable)
     { msg.d_ptr->parametersValidated = enable; }
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm
index 3fba833..0199e87 100644
--- a/src/gui/kernel/qapplication_mac.mm
+++ b/src/gui/kernel/qapplication_mac.mm
@@ -1237,7 +1237,7 @@ void qt_init(QApplicationPrivate *priv, int)
 
     // Cocoa application delegate
 #ifdef QT_MAC_USE_COCOA
-    NSApplication *cocoaApp = [NSApplication sharedApplication];
+    NSApplication *cocoaApp = [QNSApplication sharedApplication];
     QMacCocoaAutoReleasePool pool;
     NSObject *oldDelegate = [cocoaApp delegate];
     QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) *newDelegate = [QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) sharedDelegate];
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 3355272..2c6e246 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -2547,6 +2547,17 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
             result = true;
             break;
         }
+#ifndef QT_NO_CURSOR
+        case WM_SETCURSOR: {
+            QCursor *ovr = QApplication::overrideCursor();
+            if (ovr) {
+                SetCursor(ovr->handle());
+                RETURN(TRUE);
+            }
+            result = false;
+            break;
+        }
+#endif
         default:
             result = false;                        // event was not processed
             break;
diff --git a/src/gui/kernel/qcocoaapplication_mac.mm b/src/gui/kernel/qcocoaapplication_mac.mm
index 5b98420..5629940 100644
--- a/src/gui/kernel/qcocoaapplication_mac.mm
+++ b/src/gui/kernel/qcocoaapplication_mac.mm
@@ -107,5 +107,50 @@
             | NSFontPanelStrikethroughEffectModeMask;
 }
 
+
+- (void)qt_sendPostedMessage:(NSEvent *)event
+{
+    // WARNING: data1 and data2 is truncated to from 64-bit to 32-bit on OS 10.5! 
+    // That is why we need to split the address in two parts:
+    quint64 lower = [event data1];
+    quint64 upper = [event data2];
+    QCocoaPostMessageArgs *args = reinterpret_cast<QCocoaPostMessageArgs *>(lower | (upper << 32));
+    [args->target performSelector:args->selector];
+    delete args;
+}
+
+- (BOOL)qt_sendEvent:(NSEvent *)event
+{
+    if ([event type] == NSApplicationDefined) {
+        switch ([event subtype]) {
+            case QtCocoaEventSubTypePostMessage:
+                [NSApp qt_sendPostedMessage:event];
+                return true;
+            default:
+                break;
+        }
+    }
+    return false;
+}
+
 @end
+
+@implementation QNSApplication
+
+// WARNING: If Qt did not create NSApplication (this can e.g.
+// happend if Qt is used as a plugin from a 3rd-party cocoa
+// application), QNSApplication::sendEvent will never be called.
+// SO DO NOT RELY ON THIS FUNCTION BEING AVAILABLE. 
+// Plugin developers that _do_ control the NSApplication sub-class
+// implementation of the 3rd-party application can call qt_sendEvent
+// from the sub-class event handler (like we do here) to work around
+// any issues.
+- (void)sendEvent:(NSEvent *)event
+{
+    if (![self qt_sendEvent:event])
+        [super sendEvent:event];
+}
+
+@end
+
 #endif
diff --git a/src/gui/kernel/qcocoaapplication_mac_p.h b/src/gui/kernel/qcocoaapplication_mac_p.h
index e845d58..5569feb 100644
--- a/src/gui/kernel/qcocoaapplication_mac_p.h
+++ b/src/gui/kernel/qcocoaapplication_mac_p.h
@@ -99,5 +99,13 @@ QT_FORWARD_DECLARE_CLASS(QApplicationPrivate)
 - (QApplicationPrivate *)QT_MANGLE_NAMESPACE(qt_qappPrivate);
 - (QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *)QT_MANGLE_NAMESPACE(qt_qcocoamenuLoader);
 - (int)QT_MANGLE_NAMESPACE(qt_validModesForFontPanel):(NSFontPanel *)fontPanel;
+
+- (void)qt_sendPostedMessage:(NSEvent *)event;
+- (BOOL)qt_sendEvent:(NSEvent *)event;
+@end
+
+@interface QNSApplication : NSApplication {
+}
 @end
+
 #endif
diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm
index 18b3772..573b763 100644
--- a/src/gui/kernel/qcocoamenuloader_mac.mm
+++ b/src/gui/kernel/qcocoamenuloader_mac.mm
@@ -46,6 +46,7 @@
 #include <private/qcocoamenuloader_mac_p.h>
 #include <private/qapplication_p.h>
 #include <private/qt_mac_p.h>
+#include <private/qmenubar_p.h>
 #include <qmenubar.h>
 
 QT_FORWARD_DECLARE_CLASS(QCFString)
@@ -208,6 +209,11 @@ QT_USE_NAMESPACE
     [NSApp hide:sender];
 }
 
+- (void)qtUpdateMenubar
+{
+    QMenuBarPrivate::macUpdateMenuBarImmediatly();
+}
+
 - (IBAction)qtDispatcherToQAction:(id)sender
 {
     QScopedLoopLevelCounter loopLevelCounter(QApplicationPrivate::instance()->threadData);
diff --git a/src/gui/kernel/qcocoamenuloader_mac_p.h b/src/gui/kernel/qcocoamenuloader_mac_p.h
index 81c136e..2504b8c 100644
--- a/src/gui/kernel/qcocoamenuloader_mac_p.h
+++ b/src/gui/kernel/qcocoamenuloader_mac_p.h
@@ -85,6 +85,7 @@
 - (IBAction)unhideAllApplications:(id)sender;
 - (IBAction)hide:(id)sender;
 - (IBAction)qtDispatcherToQAction:(id)sender;
+- (void)qtUpdateMenubar;
 @end
 
 #endif // QT_MAC_USE_COCOA
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
index a1d2c61..9fe5ae0 100644
--- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
+++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
@@ -183,8 +183,18 @@ QT_END_NAMESPACE
 
 - (void)sendEvent:(NSEvent *)event
 {
-    QWidget *widget = [[QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] qt_qwidgetForWindow:self];
+    if ([event type] == NSApplicationDefined) {
+        switch ([event subtype]) {
+            case QtCocoaEventSubTypePostMessage:
+                [NSApp qt_sendPostedMessage:event];
+                return;
+            default:
+                break;
+        }
+        return;
+    }
 
+    QWidget *widget = [[QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] qt_qwidgetForWindow:self];
     // Cocoa can hold onto the window after we've disavowed its knowledge. So,
     // if we get sent an event afterwards just have it go through the super's
     // version and don't do any stuff with Qt.
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 70c78c8..c3fbaad 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -489,7 +489,15 @@ extern "C" {
             qWarning("QWidget::repaint: Recursive repaint detected");
 
         const QRect qrect = QRect(aRect.origin.x, aRect.origin.y, aRect.size.width, aRect.size.height);
-        QRegion qrgn(qrect);
+        QRegion qrgn;
+
+	const NSRect *rects;
+	NSInteger count;
+	[self getRectsBeingDrawn:&rects count:&count];
+	for (int i = 0; i < count; ++i) {
+	    QRect tmpRect = QRect(rects[i].origin.x, rects[i].origin.y, rects[i].size.width, rects[i].size.height);
+	    qrgn += tmpRect;
+	}
 
         if (!qwidget->isWindow() && !qobject_cast<QAbstractScrollArea *>(qwidget->parent())) {
             const QRegion &parentMask = qwidget->window()->mask();
diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm
index c7d042d..8a67dee 100644
--- a/src/gui/kernel/qeventdispatcher_mac.mm
+++ b/src/gui/kernel/qeventdispatcher_mac.mm
@@ -1064,10 +1064,9 @@ void QEventDispatcherMacPrivate::cancelWaitForMoreEvents()
     // In case the event dispatcher is waiting for more
     // events somewhere, we post a dummy event to wake it up:
     QMacCocoaAutoReleasePool pool;
-    static const short NSAppShouldStopForQt = SHRT_MAX;
     [NSApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined location:NSZeroPoint
         modifierFlags:0 timestamp:0. windowNumber:0 context:0
-        subtype:NSAppShouldStopForQt data1:0 data2:0] atStart:NO];
+        subtype:QtCocoaEventSubTypeWakeup data1:0 data2:0] atStart:NO];
 }
 #endif
 
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index 4e51cf4..f2ec4af 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -83,6 +83,7 @@
 #include <private/qt_cocoa_helpers_mac_p.h>
 #include <private/qt_mac_p.h>
 #include <private/qapplication_p.h>
+#include <private/qcocoaapplication_mac_p.h>
 #include <private/qcocoawindow_mac_p.h>
 #include <private/qcocoaview_mac_p.h>
 #include <private/qkeymapper_p.h>
@@ -1279,22 +1280,42 @@ void qt_cocoaChangeOverrideCursor(const QCursor &cursor)
     QMacCocoaAutoReleasePool pool;
     [static_cast<NSCursor *>(qt_mac_nsCursorForQCursor(cursor)) set];
 }
-#endif
 
-@implementation DebugNSApplication {
-}
-- (void)sendEvent:(NSEvent *)event
+//  WARNING: If Qt did not create NSApplication (e.g. in case it is
+//  used as a plugin), and at the same time, there is no window on
+//  screen (or the window that the event is sendt to becomes hidden etc
+//  before the event gets delivered), the message will not be performed.
+bool qt_cocoaPostMessage(id target, SEL selector)
 {
-    NSLog(@"NSAppDebug: sendEvent: %@", event);
-    return [super sendEvent:event];
-}
+    if (!target)
+        return false;
 
-- (BOOL)sendAction:(SEL)anAction to:(id)aTarget from:(id)sender
-{
-    NSLog(@"NSAppDebug: sendAction: %s to %@ from %@", anAction, aTarget, sender);
-    return [super sendAction:anAction to:aTarget from:sender];
+    NSInteger windowNumber = 0;
+    if (![NSApp isMemberOfClass:[QNSApplication class]]) {
+        // INVARIANT: Cocoa is not using our NSApplication subclass. That means
+        // we don't control the main event handler either. So target the event
+        // for one of the windows on screen:
+        NSWindow *nswin = [NSApp mainWindow];
+        if (!nswin) {
+            nswin = [NSApp keyWindow];
+            if (!nswin)
+                return false;
+        }
+        windowNumber = [nswin windowNumber];
+    }
+
+    // WARNING: data1 and data2 is truncated to from 64-bit to 32-bit on OS 10.5! 
+    // That is why we need to split the address in two parts:
+    QCocoaPostMessageArgs *args = new QCocoaPostMessageArgs(target, selector);
+    quint32 lower = quintptr(args);
+    quint32 upper = quintptr(args) >> 32;
+    NSEvent *e = [NSEvent otherEventWithType:NSApplicationDefined
+        location:NSZeroPoint modifierFlags:0 timestamp:0 windowNumber:windowNumber
+        context:nil subtype:QtCocoaEventSubTypePostMessage data1:lower data2:upper];
+    [NSApp postEvent:e atStart:NO];
+    return true;
 }
-@end
+#endif
 
 QMacCocoaAutoReleasePool::QMacCocoaAutoReleasePool()
 {
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
index ace8255..c43ea55 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h
+++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
@@ -114,6 +114,12 @@ typedef struct CGPoint NSPoint;
 #endif
 
 QT_BEGIN_NAMESPACE
+
+enum {
+    QtCocoaEventSubTypeWakeup       = SHRT_MAX,
+    QtCocoaEventSubTypePostMessage  = SHRT_MAX-1
+};
+
 Qt::MouseButtons qt_mac_get_buttons(int buttons);
 Qt::MouseButton qt_mac_get_button(EventMouseButton button);
 void macWindowFade(void * /*OSWindowRef*/ window, float durationSeconds = 0.15);
@@ -182,8 +188,23 @@ inline QString qt_mac_NSStringToQString(const NSString *nsstr)
 inline NSString *qt_mac_QStringToNSString(const QString &qstr)
 { return [reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
 
-@interface DebugNSApplication : NSApplication {}
-@end
+#ifdef QT_MAC_USE_COCOA
+class QCocoaPostMessageArgs {
+public:
+    id target;
+    SEL selector;
+    QCocoaPostMessageArgs(id target, SEL selector) : target(target), selector(selector)
+    {
+        [target retain];
+    }
+
+    ~QCocoaPostMessageArgs()
+    {
+        [target release];
+    }
+};
+bool qt_cocoaPostMessage(id target, SEL selector);
+#endif
 
 #endif
 
diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp
index 6a0e363..cc74a53 100644
--- a/src/gui/widgets/qdialogbuttonbox.cpp
+++ b/src/gui/widgets/qdialogbuttonbox.cpp
@@ -103,7 +103,7 @@ QT_BEGIN_NAMESPACE
     You can mix and match normal buttons and standard buttons.
 
     Currently the buttons are laid out in the following way if the button box is horizontal:
-    \table 100%
+    \table
     \row \o \inlineimage buttonbox-gnomelayout-horizontal.png GnomeLayout Horizontal
          \o Button box laid out in horizontal GnomeLayout
     \row \o \inlineimage buttonbox-kdelayout-horizontal.png KdeLayout Horizontal
@@ -116,25 +116,23 @@ QT_BEGIN_NAMESPACE
 
     The buttons are laid out the following way if the button box is vertical:
 
-    \table 100%
+    \table
+    \row \o GnomeLayout
+         \o KdeLayout
+         \o MacLayout
+         \o WinLayout
     \row \o \inlineimage buttonbox-gnomelayout-vertical.png GnomeLayout Vertical
-         \o Button box laid out in vertical GnomeLayout
-    \row \o \inlineimage buttonbox-kdelayout-vertical.png KdeLayout Vertical
-         \o Button box laid out in vertical KdeLayout
-    \row \o \inlineimage buttonbox-maclayout-vertical.png MacLayout Vertical
-         \o Button box laid out in vertical MacLayout
-    \row \o \inlineimage buttonbox-winlayout-vertical.png WinLayout Vertical
-         \o Button box laid out in vertical WinLayout
+         \o \inlineimage buttonbox-kdelayout-vertical.png KdeLayout Vertical
+         \o \inlineimage buttonbox-maclayout-vertical.png MacLayout Vertical
+         \o \inlineimage buttonbox-winlayout-vertical.png WinLayout Vertical
     \endtable
 
     Additionally, button boxes that contain only buttons with ActionRole or
-    HelpRole can be considered modeless and have an alternate look on the mac:
+    HelpRole can be considered modeless and have an alternate look on Mac OS X:
 
-    \table 100%
-    \row \o \inlineimage buttonbox-mac-modeless-horizontal.png Screenshot of modeless horizontal MacLayout
-         \o modeless horizontal MacLayout
-    \row \o \inlineimage buttonbox-mac-modeless-vertical.png Screenshot of modeless vertical MacLayout
-         \o modeless vertical MacLayout
+    \table
+    \row \o modeless horizontal MacLayout
+         \o \inlineimage buttonbox-mac-modeless-horizontal.png Screenshot of modeless horizontal MacLayout
     \endtable
 
     When a button is clicked in the button box, the clicked() signal is emitted
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index 658a020..99c550f 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -2030,6 +2030,18 @@ void qt_mac_clear_menubar()
 */
 bool QMenuBar::macUpdateMenuBar()
 {
+#ifdef QT_MAC_USE_COCOA
+    QMacCocoaAutoReleasePool pool;
+    if (!qt_cocoaPostMessage(getMenuLoader(), @selector(qtUpdateMenubar)))
+        return QMenuBarPrivate::macUpdateMenuBarImmediatly();
+    return true;
+#else
+    return QMenuBarPrivate::macUpdateMenuBarImmediatly();
+#endif
+}
+
+bool QMenuBarPrivate::macUpdateMenuBarImmediatly()
+{
     bool ret = false;
     cancelAllMenuTracking();
     QWidget *w = findWindowThatShouldDisplayMenubar();
@@ -2095,8 +2107,9 @@ bool QMenuBar::macUpdateMenuBar()
         }
     }
 
-    if(!ret)
+    if (!ret) {
         qt_mac_clear_menubar();
+    }
     return ret;
 }
 
diff --git a/src/gui/widgets/qmenubar_p.h b/src/gui/widgets/qmenubar_p.h
index f2e5357..819aee4 100644
--- a/src/gui/widgets/qmenubar_p.h
+++ b/src/gui/widgets/qmenubar_p.h
@@ -196,6 +196,7 @@ public:
             return 0;
         }
     } *mac_menubar;
+    static bool macUpdateMenuBarImmediatly();
     bool macWidgetHasNativeMenubar(QWidget *widget);
     void macCreateMenuBar(QWidget *);
     void macDestroyMenuBar();
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index a0b332d..c18129d 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -3086,7 +3086,7 @@ void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x4 *
 */
 int QGLShaderProgram::maxGeometryOutputVertices() const
 {
-    int n;
+    GLint n;
     glGetIntegerv(GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT, &n);
     return n;
 }
diff --git a/tools/qdoc3/codeparser.cpp b/tools/qdoc3/codeparser.cpp
index 3ad3372..5ae63ac 100644
--- a/tools/qdoc3/codeparser.cpp
+++ b/tools/qdoc3/codeparser.cpp
@@ -59,6 +59,7 @@ QT_BEGIN_NAMESPACE
 #define COMMAND_MAINCLASS               Doc::alias(QLatin1String("mainclass"))
 #define COMMAND_NONREENTRANT            Doc::alias(QLatin1String("nonreentrant"))
 #define COMMAND_OBSOLETE                Doc::alias(QLatin1String("obsolete"))
+#define COMMAND_PAGEKEYWORDS            Doc::alias(QLatin1String("pagekeywords"))
 #define COMMAND_PRELIMINARY             Doc::alias(QLatin1String("preliminary"))
 #define COMMAND_INPUBLICGROUP           Doc::alias(QLatin1String("inpublicgroup"))
 #define COMMAND_REENTRANT               Doc::alias(QLatin1String("reentrant"))
@@ -170,6 +171,7 @@ QSet<QString> CodeParser::commonMetaCommands()
                            << COMMAND_MAINCLASS
                            << COMMAND_NONREENTRANT
                            << COMMAND_OBSOLETE
+                           << COMMAND_PAGEKEYWORDS
                            << COMMAND_PRELIMINARY
                            << COMMAND_INPUBLICGROUP
                            << COMMAND_REENTRANT
@@ -230,6 +232,9 @@ void CodeParser::processCommonMetaCommand(const Location &location,
     else if (command == COMMAND_SINCE) {
         node->setSince(arg);
     }
+    else if (command == COMMAND_PAGEKEYWORDS) {
+        node->addPageKeywords(arg);
+    }
     else if (command == COMMAND_SUBTITLE) {
 	if (node->type() == Node::Fake) {
 	    FakeNode *fake = static_cast<FakeNode *>(node);
diff --git a/tools/qdoc3/config.cpp b/tools/qdoc3/config.cpp
index f62ec24..acb1576 100644
--- a/tools/qdoc3/config.cpp
+++ b/tools/qdoc3/config.cpp
@@ -671,7 +671,9 @@ void Config::load(Location location, const QString& fileName)
             location.fatal(tr("Cannot open file '%1': %2").arg(fileName).arg(fin.errorString()));
     }
 
-    QString text = fin.readAll();
+    QTextStream stream(&fin);
+    stream.setCodec("UTF-8");
+    QString text = stream.readAll();
     text += QLatin1String("\n\n");
     text += QChar('\0');
     fin.close();
diff --git a/tools/qdoc3/config.h b/tools/qdoc3/config.h
index 5e7e6f1..6f23469 100644
--- a/tools/qdoc3/config.h
+++ b/tools/qdoc3/config.h
@@ -140,8 +140,10 @@ class Config
 #define CONFIG_INDEXES                  "indexes"
 #define CONFIG_LANGUAGE                 "language"
 #define CONFIG_MACRO                    "macro"
+#define CONFIG_NATURALLANGUAGE          "naturallanguage"
 #define CONFIG_OBSOLETELINKS            "obsoletelinks"
 #define CONFIG_OUTPUTDIR                "outputdir"
+#define CONFIG_OUTPUTENCODING           "outputencoding"
 #define CONFIG_OUTPUTLANGUAGE           "outputlanguage"
 #define CONFIG_OUTPUTFORMATS            "outputformats"
 #define CONFIG_PROJECT                  "project"
@@ -150,6 +152,7 @@ class Config
 #define CONFIG_SLOW                     "slow"
 #define CONFIG_SHOWINTERNAL             "showinternal"
 #define CONFIG_SOURCEDIRS               "sourcedirs"
+#define CONFIG_SOURCEENCODING           "sourceencoding"
 #define CONFIG_SOURCES                  "sources"
 #define CONFIG_SPURIOUS                 "spurious"
 #define CONFIG_STYLESHEETS              "stylesheets"
diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp
index d9c767a..657cfbb 100644
--- a/tools/qdoc3/cppcodemarker.cpp
+++ b/tools/qdoc3/cppcodemarker.cpp
@@ -881,8 +881,7 @@ QString CppCodeMarker::addMarkUp(const QString& protectedCode,
     static QRegExp globalX("[\n{()=] *([a-zA-Z_][a-zA-Z_0-9]*)[ \n]*\\(");
     static QRegExp multiLineComment("/(?:( )?\\*(?:[^*]+|\\*(?! /))*\\*\\1/)");
     multiLineComment.setMinimal(true);
-    static QRegExp singleLineCommentLine("(?:^|\n)(?:[^&]|&(?!quot;)|&quot;(?:[^&\\\\]|&(?!quot;)|\\\\&quot;|\\\\(?!&quot;))*&quot;)*//(?!!)[^!\n]*");
-    static QRegExp singleLineComment("//(?!!)[^!\n]*");
+    static QRegExp singleLineComment("[^:]//(?!!)[^!\\n]*");
     static QRegExp preprocessor("(?:^|\n)(#[ \t]*(?:include|if|elif|endif|error|pragma|define"
                                 "|warning)(?:(?:\\\\\n|\\n#)[^\n]*)*)");
     static QRegExp literals("&quot;(?:[^\\\\&]|\\\\[^\n]|&(?!quot;))*&quot;"
@@ -1057,8 +1056,7 @@ QString CppCodeMarker::addMarkUp(const QString& protectedCode,
         int mlpos;
         int slpos;
         int len;
-        int sllpos = singleLineCommentLine.indexIn(result, pos);
-        slpos = sllpos == -1 ? -1 : singleLineComment.indexIn(result, sllpos);
+        slpos = singleLineComment.indexIn(result, pos);
         mlpos = multiLineComment.indexIn(result, pos);
 
         if (slpos == -1 && mlpos == -1)
@@ -1069,13 +1067,13 @@ QString CppCodeMarker::addMarkUp(const QString& protectedCode,
             len = multiLineComment.matchedLength();
         }
         else if (mlpos == -1) {
-            pos = slpos;
-            len = singleLineComment.matchedLength();
+            pos = slpos + 1;
+            len = singleLineComment.matchedLength() - 1;
         }
         else {
             if (slpos < mlpos) {
-                pos = slpos;
-                len = singleLineComment.matchedLength();
+                pos = slpos + 1;
+                len = singleLineComment.matchedLength() - 1;
             }
             else {
                 pos = mlpos;
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp
index 7d08c77..c8655a4 100644
--- a/tools/qdoc3/cppcodeparser.cpp
+++ b/tools/qdoc3/cppcodeparser.cpp
@@ -281,8 +281,8 @@ void CppCodeParser::parseHeaderFile(const Location& location,
                                     const QString& filePath,
                                     Tree *tree)
 {
-    FILE *in = fopen(QFile::encodeName(filePath), "r");
-    if (!in) {
+    QFile in(filePath);
+    if (!in.open(QIODevice::ReadOnly)) {
         location.error(tr("Cannot open C++ header file '%1'").arg(filePath));
         return;
     }
@@ -295,7 +295,7 @@ void CppCodeParser::parseHeaderFile(const Location& location,
     matchDeclList(tree->root());
     if (!fileTokenizer.version().isEmpty())
         tree->setVersion(fileTokenizer.version());
-    fclose(in);
+    in.close();
 
     if (fileLocation.fileName() == "qiterator.h")
         parseQiteratorDotH(location, filePath);
@@ -312,8 +312,8 @@ void CppCodeParser::parseSourceFile(const Location& location,
                                     const QString& filePath,
                                     Tree *tree)
 {
-    FILE *in = fopen(QFile::encodeName(filePath), "r");
-    if (!in) {
+    QFile in(filePath);
+    if (!in.open(QIODevice::ReadOnly)) {
         location.error(tr("Cannot open C++ source file '%1' (%2)").arg(filePath).arg(strerror(errno)));
         return;
     }
@@ -325,7 +325,7 @@ void CppCodeParser::parseSourceFile(const Location& location,
     readToken();
     usedNamespaces.clear();
     matchDocsAndStuff();
-    fclose(in);
+    in.close();
 }
 
 /*!
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index 17a6efd..ad4cdde 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -3056,7 +3056,8 @@ QString Doc::canonicalTitle(const QString &title)
             slurping = true;
         }
         else {
-            // !alnum && slurping -> nothin
+            result += title[i];
+            lastAlnum = result.size();
         }
     }
     result.truncate(lastAlnum);
diff --git a/tools/qdoc3/doc/classic.css b/tools/qdoc3/doc/classic.css
new file mode 100644
index 0000000..b8cae8e
--- /dev/null
+++ b/tools/qdoc3/doc/classic.css
@@ -0,0 +1,284 @@
+BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {
+  font-family: Arial, Geneva, Helvetica, sans-serif;
+}
+H1 {
+  text-align: center;
+  font-size: 160%;
+}
+H2 {
+  font-size: 120%;
+}
+H3 {
+  font-size: 100%;
+}
+
+h3.fn,span.fn
+{
+  background-color: #eee;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #ddd;
+  font-weight: bold;
+  padding: 6px 0px 6px 10px;
+  margin: 42px 0px 0px 0px;
+}
+
+hr {
+  border: 0;
+  color: #a0a0a0;
+  background-color: #ccc;
+  height: 1px;
+  width: 100%;
+  text-align: left;
+  margin: 34px 0px 34px 0px;
+}
+
+table.valuelist {
+	border-width: 1px 1px 1px 1px;
+	border-style: solid;
+	border-color: #dddddd;
+	border-collapse: collapse;
+	background-color: #f0f0f0;
+}
+
+table.indextable {
+	border-width: 1px 1px 1px 1px;
+	border-style: solid;
+	border-collapse: collapse;
+	background-color: #f0f0f0;
+    border-color:#555;
+    font-size: 100%;
+}
+
+table td.largeindex {
+	border-width: 1px 1px 1px 1px;
+	border-collapse: collapse;
+	background-color: #f0f0f0;
+    border-color:#555;
+    font-size: 120%;
+}
+
+table.valuelist th {
+	border-width: 1px 1px 1px 2px;
+	padding: 4px;
+	border-style: solid;
+	border-color: #666;
+    color:white;
+    background-color:#666;
+}
+
+th.titleheader  {
+	border-width: 1px 0px 1px 0px;
+	padding: 2px;
+	border-style: solid;
+	border-color: #666;
+    color:white;
+    background-color:#555;
+    background-image:url('images/gradient.png')};
+    background-repeat: repeat-x;
+    font-size: 100%;
+}
+
+
+th.largeheader {
+	border-width: 1px 0px 1px 0px;
+	padding: 4px;
+	border-style: solid;
+	border-color: #444;
+    color:white;
+    background-color:#555555;
+    font-size: 120%;
+}
+
+p {
+
+  margin-left: 4px;
+  margin-top: 8px;
+  margin-bottom: 8px;
+}
+
+a:link
+{
+  color: #0046ad;
+  text-decoration: none
+}
+
+a:visited
+{
+  color: #672967;
+  text-decoration: none
+}
+
+a.obsolete
+{
+  color: #661100;
+  text-decoration: none
+}
+
+a.compat
+{
+  color: #661100;
+  text-decoration: none
+}
+
+a.obsolete:visited
+{
+  color: #995500;
+  text-decoration: none
+}
+
+a.compat:visited
+{
+  color: #995500;
+  text-decoration: none
+}
+
+body
+{
+  background: #ffffff;
+  color: black
+}
+
+table.generic, table.annotated
+{
+  border-width: 1px;
+  border-color:#bbb;
+  border-style:solid;  
+  border-collapse:collapse;
+}
+
+table td.memItemLeft {
+  width: 180px;
+  padding: 2px 0px 0px 8px;
+  margin: 4px;
+  border-width: 1px;
+  border-color: #E0E0E0;
+  border-style: none;
+  font-size: 100%;
+  white-space: nowrap
+}
+
+table td.memItemRight {
+  padding: 2px 8px 0px 8px;
+  margin: 4px;
+  border-width: 1px;
+  border-color: #E0E0E0;
+  border-style: none;
+  font-size: 100%;
+}
+
+table tr.odd {
+  background: #f0f0f0;
+  color: black;
+}
+
+table tr.even {
+  background: #e4e4e4;
+  color: black;
+}
+
+table.annotated th {
+  padding: 3px;
+  text-align: left
+}
+
+table.annotated td {
+  padding: 3px;
+}
+
+table tr pre
+{
+  padding-top: 0px;
+  padding-bottom: 0px;
+  padding-left: 0px;
+  padding-right: 0px;
+  border: none;
+  background: none
+}
+
+tr.qt-style
+{
+  background: #96E066;
+  color: black
+}
+
+body pre
+{
+  padding: 0.2em;
+  border: #e7e7e7 1px solid;
+  background: #f1f1f1;
+  color: black
+}
+
+table tr.qt-code pre
+{
+  padding: 0.2em;
+  border: #e7e7e7 1px solid;
+  background: #f1f1f1;
+  color: black
+}
+
+span.preprocessor, span.preprocessor a
+{
+  color: darkblue;
+}
+
+span.comment
+{
+  color: darkred;
+  font-style: italic
+}
+
+span.string,span.char
+{
+  color: darkgreen;
+}
+
+.title
+{
+    text-align: center
+}
+
+.subtitle
+{
+    font-size: 0.8em
+}
+
+.small-subtitle
+{
+    font-size: 0.65em
+}
+
+.qmlitem {
+    padding: 0;
+}
+
+.qmlname {
+    white-space: nowrap;
+}
+
+.qmltype {
+    text-align: center;
+    font-size: 160%;
+}
+
+.qmlproto {
+    background-color: #eee;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #ddd;
+    font-weight: bold;
+    padding: 6px 10px 6px 10px;
+    margin: 42px 0px 0px 0px;
+}
+
+.qmlreadonly {
+    float: right;
+    color: red
+}
+
+.qmldoc {
+}
+
+*.qmlitem p {
+}
diff --git a/tools/qdoc3/doc/examples/layoutmanagement.qdocinc b/tools/qdoc3/doc/examples/layoutmanagement.qdocinc
new file mode 100644
index 0000000..01f8acf
--- /dev/null
+++ b/tools/qdoc3/doc/examples/layoutmanagement.qdocinc
@@ -0,0 +1,13 @@
+\section1 Layout Classes
+
+The Qt layout system provides a simple and powerful way of specifying
+the layout of child widgets.
+
+By specifying the logical layout once, you get the following benefits:
+
+\list
+    \o Positioning of child widgets.
+    \o Sensible default sizes for windows.
+    \o Sensible minimum sizes for windows.
+    \o ...
+\endlist
diff --git a/tools/qdoc3/doc/examples/main.cpp b/tools/qdoc3/doc/examples/main.cpp
new file mode 100644
index 0000000..e2cf6c5
--- /dev/null
+++ b/tools/qdoc3/doc/examples/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QPushButton>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QPushButton *hello("Hello world!");
+    hello.resize(100, 30);
+
+    hello.show();
+    return app.exec();
+}
diff --git a/tools/qdoc3/doc/examples/minimum.qdocconf b/tools/qdoc3/doc/examples/minimum.qdocconf
new file mode 100644
index 0000000..e5e9e67
--- /dev/null
+++ b/tools/qdoc3/doc/examples/minimum.qdocconf
@@ -0,0 +1,42 @@
+# QDoc is a tool that constantly evolves to suit our needs,
+# and there are some compatibility issues between old and new
+# practices. For that reason, any QDoc configuration file needs to
+# include compat.qdocconf.
+
+#include(compat.qdocconf)
+
+
+# The outputdir variable specifies the directory 
+# where QDoc will put the generated documentation.
+
+outputdir   = html
+
+
+# The headerdirs variable specifies the directories 
+# containing the header files associated 
+# with the .cpp source files used in the documentation.
+
+headerdirs  = .
+
+
+# The sourcedirs variable specifies the 
+# directories containing the .cpp or .qdoc 
+# files used in the documentation.
+
+#sourcedirs  = .
+
+
+# The exampledirs variable specifies the directories containing 
+# the source code of the example files.
+
+exampledirs = .
+
+
+# The imagedirs variable specifies the 
+# directories containing the images used in the documentation.
+
+imagedirs   = ./images
+
+
+
+
diff --git a/tools/qdoc3/doc/examples/objectmodel.qdocinc b/tools/qdoc3/doc/examples/objectmodel.qdocinc
new file mode 100644
index 0000000..02b5991
--- /dev/null
+++ b/tools/qdoc3/doc/examples/objectmodel.qdocinc
@@ -0,0 +1,11 @@
+\section1 Qt Object Model
+
+The standard C++ object model provides very efficient runtime support
+for the object paradigm. But its static nature is inflexibile in
+certain problem domains. Graphical user interface programming is a
+domain that requires both runtime efficiency and a high level of
+flexibility. Qt provides this, by combining the speed of C++ with the
+flexibility of the Qt Object Model.
+
+...
+
diff --git a/tools/qdoc3/doc/examples/signalandslots.qdocinc b/tools/qdoc3/doc/examples/signalandslots.qdocinc
new file mode 100644
index 0000000..cfae43a
--- /dev/null
+++ b/tools/qdoc3/doc/examples/signalandslots.qdocinc
@@ -0,0 +1,9 @@
+\section1 Signals and Slots
+
+Signals and slots are used for communication between objects. The signals and
+slots mechanism is a central feature of Qt and probably the part that differs 
+most from the features provided by other frameworks.
+
+\section2 Introduction
+
+In GUI programming, when we ...
diff --git a/tools/qdoc3/doc/files/compat.qdocconf b/tools/qdoc3/doc/files/compat.qdocconf
new file mode 100644
index 0000000..5745ed9
--- /dev/null
+++ b/tools/qdoc3/doc/files/compat.qdocconf
@@ -0,0 +1,31 @@
+alias.i				= e
+alias.include			= input
+
+macro.0                         = "\\\\0"
+macro.b                         = "\\\\b"
+macro.n                         = "\\\\n"
+macro.r                         = "\\\\r"
+macro.i                         = "\\o"
+macro.i11                       = "\\o{1,1}"
+macro.i12                       = "\\o{1,2}"
+macro.i13                       = "\\o{1,3}"
+macro.i14                       = "\\o{1,4}"
+macro.i15                       = "\\o{1,5}"
+macro.i16                       = "\\o{1,6}"
+macro.i17                       = "\\o{1,7}"
+macro.i18                       = "\\o{1,8}"
+macro.i19                       = "\\o{1,9}"
+macro.i21                       = "\\o{2,1}"
+macro.i31                       = "\\o{3,1}"
+macro.i41                       = "\\o{4,1}"
+macro.i51                       = "\\o{5,1}"
+macro.i61                       = "\\o{6,1}"
+macro.i71                       = "\\o{7,1}"
+macro.i81                       = "\\o{8,1}"
+macro.i91                       = "\\o{9,1}"
+macro.img                       = "\\image"
+macro.endquote                  = "\\endquotation"
+macro.relatesto                 = "\\relates"
+
+spurious			= "Missing comma in .*" \
+				  "Missing pattern .*"
diff --git a/tools/qdoc3/doc/files/qt.qdocconf b/tools/qdoc3/doc/files/qt.qdocconf
new file mode 100644
index 0000000..942d023
--- /dev/null
+++ b/tools/qdoc3/doc/files/qt.qdocconf
@@ -0,0 +1,115 @@
+include(compat.qdocconf)
+include(macros.qdocconf)
+include(qt-cpp-ignore.qdocconf)
+include(qt-html-templates.qdocconf)
+include(qt-defines.qdocconf)
+
+project                 = Qt
+versionsym              =
+version                 = %VERSION%
+description             = Qt Reference Documentation
+url                     = http://qt.nokia.com/doc/4.6
+
+edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
+                          QtXmlPatterns QtTest
+edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg \
+                          QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
+                          QtDesigner QtAssistant QAxContainer Phonon \
+                          QAxServer QtUiTools QtTest QtDBus
+edition.DesktopLight.modules = QtCore QtDBus QtGui Qt3SupportLight QtTest
+edition.DesktopLight.groups       = -graphicsview-api
+
+qhp.projects            = Qt
+
+qhp.Qt.file                = qt.qhp
+qhp.Qt.namespace           = com.trolltech.qt.460
+qhp.Qt.virtualFolder       = qdoc
+qhp.Qt.indexTitle          = Qt Reference Documentation
+qhp.Qt.indexRoot           =
+
+# Files not referenced in any qdoc file (last four are needed by qtdemo)
+# See also extraimages.HTML
+qhp.Qt.extraFiles          = classic.css \
+                             images/qt-logo.png \
+                             images/taskmenuextension-example.png \
+                             images/coloreditorfactoryimage.png \
+                             images/dynamiclayouts-example.png \
+                             images/stylesheet-coffee-plastique.png
+
+qhp.Qt.filterAttributes    = qt 4.6.0 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.6.0
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.6.0
+qhp.Qt.subprojects         = classes overviews examples
+qhp.Qt.subprojects.classes.title = Classes
+qhp.Qt.subprojects.classes.indexTitle = Qt's Classes
+qhp.Qt.subprojects.classes.selectors = class fake:headerfile
+qhp.Qt.subprojects.classes.sortPages = true
+qhp.Qt.subprojects.overviews.title = Overviews
+qhp.Qt.subprojects.overviews.indexTitle = All Overviews and HOWTOs
+qhp.Qt.subprojects.overviews.selectors = fake:page,group,module
+qhp.Qt.subprojects.examples.title = Tutorials and Examples
+qhp.Qt.subprojects.examples.indexTitle = Qt Examples
+qhp.Qt.subprojects.examples.selectors = fake:example
+
+language                = Cpp
+
+headerdirs              = $QTDIR/src \
+                          $QTDIR/extensions/activeqt \
+                          $QTDIR/tools/assistant/lib \
+                          $QTDIR/tools/assistant/compat/lib \
+                          $QTDIR/tools/designer/src/uitools \
+                          $QTDIR/tools/designer/src/lib/extension \
+                          $QTDIR/tools/designer/src/lib/sdk \
+                          $QTDIR/tools/designer/src/lib/uilib \
+                          $QTDIR/tools/qtestlib/src \
+                          $QTDIR/tools/qdbus/src
+sourcedirs              = $QTDIR/src \
+                          $QTDIR/doc/src \
+                          $QTDIR/extensions/activeqt \
+                          $QTDIR/tools/assistant/lib \
+                          $QTDIR/tools/assistant/compat/lib \
+                          $QTDIR/tools/designer/src/uitools \
+                          $QTDIR/tools/designer/src/lib/extension \
+                          $QTDIR/tools/designer/src/lib/sdk \
+                          $QTDIR/tools/designer/src/lib/uilib \
+                          $QTDIR/tools/qtestlib/src \
+                          $QTDIR/tools/qdbus
+
+excludedirs             = $QTDIR/src/3rdparty/clucene \
+                          $QTDIR/src/3rdparty/des \
+                          $QTDIR/src/3rdparty/freetype \
+                          $QTDIR/src/3rdparty/harfbuzz \
+                          $QTDIR/src/3rdparty/kdebase \
+                          $QTDIR/src/3rdparty/libjpeg \
+                          $QTDIR/src/3rdparty/libmng \
+                          $QTDIR/src/3rdparty/libpng \
+                          $QTDIR/src/3rdparty/libtiff \
+                          $QTDIR/src/3rdparty/md4 \
+                          $QTDIR/src/3rdparty/md5 \
+                          $QTDIR/src/3rdparty/patches \
+                          $QTDIR/src/3rdparty/sha1 \
+                          $QTDIR/src/3rdparty/sqlite \
+                          $QTDIR/src/3rdparty/webkit/JavaScriptCore \
+                          $QTDIR/src/3rdparty/webkit/WebCore \
+                          $QTDIR/src/3rdparty/wintab \
+                          $QTDIR/src/3rdparty/zlib \
+                          $QTDIR/doc/src/snippets \
+                          $QTDIR/src/3rdparty/phonon/gstreamer \
+                          $QTDIR/src/3rdparty/phonon/ds9 \
+                          $QTDIR/src/3rdparty/phonon/qt7 \
+                          $QTDIR/src/3rdparty/phonon/waveout
+
+sources.fileextensions  = "*.cpp *.qdoc *.mm"
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"
+
+exampledirs             = $QTDIR/doc/src \
+                          $QTDIR/examples \
+                          $QTDIR/examples/tutorials \
+                          $QTDIR \
+                          $QTDIR/qmake/examples \
+                          $QTDIR/src/3rdparty/webkit/WebKit/qt/docs
+imagedirs               = $QTDIR/doc/src/images \
+                          $QTDIR/examples
+outputdir               = $QTDIR/doc/html
+tagfile                 = $QTDIR/doc/html/qt.tags
+base                    = file:$QTDIR/doc/html
diff --git a/tools/qdoc3/doc/images/happy.gif b/tools/qdoc3/doc/images/happy.gif
new file mode 100644
index 0000000..a4597f6
--- /dev/null
+++ b/tools/qdoc3/doc/images/happy.gif
diff --git a/tools/qdoc3/doc/images/happyguy.jpg b/tools/qdoc3/doc/images/happyguy.jpg
new file mode 100644
index 0000000..e860479
--- /dev/null
+++ b/tools/qdoc3/doc/images/happyguy.jpg
diff --git a/tools/qdoc3/doc/images/qt-logo.png b/tools/qdoc3/doc/images/qt-logo.png
new file mode 100644
index 0000000..14ddf2a
--- /dev/null
+++ b/tools/qdoc3/doc/images/qt-logo.png
diff --git a/tools/qdoc3/doc/images/training.jpg b/tools/qdoc3/doc/images/training.jpg
new file mode 100644
index 0000000..c2ce5c3
--- /dev/null
+++ b/tools/qdoc3/doc/images/training.jpg
diff --git a/tools/qdoc3/doc/qdoc-manual.qdoc b/tools/qdoc3/doc/qdoc-manual.qdoc
new file mode 100644
index 0000000..e2f670c
--- /dev/null
+++ b/tools/qdoc3/doc/qdoc-manual.qdoc
@@ -0,0 +1,8695 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page index.html
+    \nextpage QDoc Manual
+
+    \title QDoc Manual - Table of Contents
+
+    \list
+    \o \l{QDoc Manual}
+    \o \l{QDoc Commands}
+       \list
+       \o \l{Markup Commands}
+       \o \l{Text Formatting Commands}
+       \o \l{Document Structuring Commands}
+       \o \l{Verbatim Code Commands}
+       \o \l{Quoting External Code Commands}
+          \list
+          \o \l{Example File}
+          \endlist
+       \o \l{Linking Commands}
+       \o \l{Graphic Commands}
+       \o \l{Container Commands}
+       \o \l{Document Contents Commands}
+       \o \l{Miscellaneous Commands}
+          \list
+          \o \l{signalandslots.qdocinc}
+          \o \l{objectmodel.qdocinc}
+          \o \l{layoutmanagement.qdocinc}
+          \endlist
+       \o \l{Topical Commands}
+       \o \l{Contextual Commands}
+       \o \l{Navigation Commands}
+       \o \l{Status Commands}
+       \o \l{Thread Support Commands}
+       \o \l{Relating Commands}
+       \o \l{Grouping Commands}
+       \o \l{Title Commands}
+       \endlist
+    \o \l{QDoc Configuration}
+       \list
+       \o \l{General Variables}
+       \o \l{Creating Help Project Files}
+       \o \l{C++ Specific Variables}
+       \o \l{HTML Specific Variables}
+       \o \l{Supporting Derived Projects}
+       \o \l{QDoc Compatibility}
+       \o \l{qt.qdocconf}
+       \o \l{minimum.qdocconf}
+       \endlist
+    \o \l{QDoc Commands - Alphabetical List}
+    \endlist
+*/
+
+/*!
+    \page 01-qdoc-manual.html
+    \contentspage QDoc Manual - Table of Contents
+    \previouspage QDoc Manual - Table of Contents
+    \nextpage QDoc Commands
+
+    \title QDoc Manual
+
+    QDoc is the internal tool used by Qt Development Frameworks for generating
+    documentation. This document is a reference for QDoc command syntax and
+    configuration.
+
+    \section1 Overview
+
+    \list I
+    \o \section2 \l {QDoc Commands}
+
+       \l {QDoc Commands - Alphabetical List}{A complete alphabetical
+       list}.
+
+       There are two main categories of commands for QDoc: markup
+       commands and meta-commands.
+
+       The markup commands indicate the generated documentation's
+       appearance and logical structure. The meta-commands provide
+       information about the document as well as the documented
+       item. The meta-commands can be further categorized as topical
+       commands and contextual commands.
+
+       \list
+       \o \l {Markup Commands}
+           \list
+           \o \l {Text Formatting Commands}{Text Formatting}
+           \o \l {Document Structuring Commands}{Document Structuring}
+           \o \l {Verbatim Code Commands}{Verbatim Code}
+           \o \l {Quoting External Code Commands}{Quoting External Code}
+           \o \l {Linking Commands}{Linking}
+           \o \l {Graphic Commands}{Graphic}
+           \o \l {Container Commands}{Container}
+           \o \l {Document Contents Commands}{Document Contents}
+           \o \l {Miscellaneous Commands}{Miscellaneous}
+           \endlist
+       \o \l {Topical Commands}
+       \o \l {Contextual Commands}
+           \list
+           \o \l {Navigation Commands}{Navigation}
+           \o \l {Status Commands}{Status}
+           \o \l {Thread Support Commands}{Thread Support}
+           \o \l {Relating Commands}{Relating}
+           \o \l {Grouping Commands}{Grouping}
+           \o \l {Title Commands}{Title}
+           \endlist
+       \endlist
+    \endlist
+
+    \list II
+    \o \section2 \l {QDoc Configuration}
+
+       When running QDoc to generate the documentation, you must
+       specify a configuration file on the command line. The
+       configuration file is a list of entries of entries of the form
+       "variable = value".
+
+       \list
+       \o \l {Configuration Variables}
+       \o \l {Configuration File Examples}
+       \endlist
+
+       Some particular configuration variables allow you to use QDoc
+       to support Qt-based projects; i.e to make projects, such as Qt
+       Solutions, contain references to the online Qt documentation.
+
+       \list
+       \o \l {Supporting Derived Projects}
+       \endlist
+
+       QDoc is a tool that constantly evolves to suit our needs, for
+       that reason there are some compatibility issues between old and
+       new practices.
+
+       \list
+       \o \l {QDoc Compatibility}
+       \endlist
+    \endlist
+*/
+
+/*!
+    \page 02-qdoc-commands.html
+    \previouspage QDoc Manual
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Markup Commands
+
+    \title QDoc Commands
+
+    There are two main categories of commands for QDoc: markup
+    commands and meta-commands.
+
+    The markup commands indicate the generated documentation's visual
+    appearance and logical structure. The meta-commands provide
+    information about the documentation unit as well as the documented
+    item. The meta-commands can be further categorized as topical
+    commands and contextual commands.
+
+    \section1 Alphabetical List
+
+    A complete \l{QDoc Commands - Alphabetical List }
+    {alphabetical list of the QDoc commands}.
+
+    \section1 Categories
+
+    \list
+    \o \l {Markup Commands}
+    \o \l {Topical Commands}
+    \o \l {Contextual Commands}
+    \endlist
+*/
+
+/*!
+    \page 03-qdoc-commands-markup.html
+    \contentspage QDoc Manual - Table of Contents
+    \previouspage QDoc Commands
+    \nextpage Text Formatting Commands
+
+    \title Markup Commands
+
+    The markup commands indicate the generated documentation's visual
+    appearance and logical structure.
+
+    \section1 Alphabetical List
+
+    \l {04-qdoc-commands-textformatting.html#backslash}{\\\\},
+    \l {04-qdoc-commands-textformatting.html#a}{\\a},
+    \l {11-qdoc-commands-documentcontents.html#abstract}{\\abstract},
+    \l {06-qdoc-commands-verbatimcode.html#badcode}{\\badcode},
+    \l {04-qdoc-commands-textformatting.html#bold}{\\bold},
+    \l {11-qdoc-commands-documentcontents.html#brief}{\\brief},
+    \l {04-qdoc-commands-textformatting.html#c}{\\c},
+    \l {09-qdoc-commands-graphic.html#caption}{\\caption},
+    \l {05-qdoc-commands-documentstructuring.html#chapter}{\\chapter},
+    \l {06-qdoc-commands-verbatimcode.html#code}{\\code},
+    \l {07-0-qdoc-commands-quoting.html#codeline}{\\codeline},
+    \l {07-0-qdoc-commands-quoting.html#dots}{\\dots},
+    \l {12-0-qdoc-commands-miscellaneous.html#else}{\\else},
+    \l {12-0-qdoc-commands-miscellaneous.html#endif}{\\endif},
+    \l {12-0-qdoc-commands-miscellaneous.html#expire}{\\expire},
+    \l {11-qdoc-commands-documentcontents.html#footnote}{\\footnote},
+    \l {12-0-qdoc-commands-miscellaneous.html#generatelist}{\\generatelist},
+    \l {10-qdoc-commands-container.html#header}{\\header},
+    \l {04-qdoc-commands-textformatting.html#i}{\\i},
+    \l {12-0-qdoc-commands-miscellaneous.html#if}{\\if},
+    \l {09-qdoc-commands-graphic.html#image}{\\image},
+    \l {12-0-qdoc-commands-miscellaneous.html#include}{\\include},
+    \l {09-qdoc-commands-graphic.html#inlineimage}{\\inlineimage},
+    \l {08-qdoc-commands-linking.html#keyword}{\\keyword},
+    \l {08-qdoc-commands-linking.html#l}{\\l},
+    \l {11-qdoc-commands-documentcontents.html#legalese}{\\legalese},
+    \l {10-qdoc-commands-container.html#list}{\\list},
+    \l {12-0-qdoc-commands-miscellaneous.html#meta}{\\meta},
+    \l {06-qdoc-commands-verbatimcode.html#newcode}{\\newcode},
+    \l {10-qdoc-commands-container.html#o}{\\o},
+    \l {06-qdoc-commands-verbatimcode.html#oldcode}{\\oldcode},
+    \l {12-0-qdoc-commands-miscellaneous.html#omit}{\\omit},
+    \l {05-qdoc-commands-documentstructuring.html#part}{\\part},
+    \l {07-0-qdoc-commands-quoting.html#printline}{\\printline},
+    \l {07-0-qdoc-commands-quoting.html#printto}{\\printto},
+    \l {07-0-qdoc-commands-quoting.html#printuntil}{\\printuntil},
+    \l {11-qdoc-commands-documentcontents.html#quotation}{\\quotation},
+    \l {07-0-qdoc-commands-quoting.html#quotefile}{\\quotefile},
+    \l {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile},
+    \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\raw},
+    \l {10-qdoc-commands-container.html#row}{\\row},
+    \l {08-qdoc-commands-linking.html#sa}{\\sa},
+    \l {05-qdoc-commands-documentstructuring.html#sectionOne}{\\section1},
+    \l {05-qdoc-commands-documentstructuring.html#sectionTwo}{\\section2},
+    \l {05-qdoc-commands-documentstructuring.html#sectionThree}{\\section3},
+    \l {05-qdoc-commands-documentstructuring.html#sectionFour}{\\section4},
+    \l {07-0-qdoc-commands-quoting.html#skipline}{\\skipline},
+    \l {07-0-qdoc-commands-quoting.html#skipto}{\\skipto},
+    \l {07-0-qdoc-commands-quoting.html#skipuntil}{\\skipuntil},
+    \l {07-0-qdoc-commands-quoting.html#snippet}{\\snippet},
+    \l {04-qdoc-commands-textformatting.html#sub}{\\sub},
+    \l {04-qdoc-commands-textformatting.html#sup}{\\sup},
+    \l {10-qdoc-commands-container.html#table}{\\table},
+    \l {11-qdoc-commands-documentcontents.html#tableofcontents}
+       {\\tableofcontents},
+    \l {08-qdoc-commands-linking.html#target}{\\target},
+    \l {04-qdoc-commands-textformatting.html#tt}{\\tt},
+    \l {04-qdoc-commands-textformatting.html#underline}{\\underline},
+    \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\unicode},
+    \l {11-qdoc-commands-documentcontents.html#warning}{\\warning}
+
+    \section1 Categories
+    \list
+    \o \l {Text Formatting Commands}
+    \o \l {Document Structuring Commands}
+    \o \l {Verbatim Code Commands}
+    \o \l {Quoting External Code Commands}
+    \o \l {Linking Commands}
+    \o \l {Graphic Commands}
+    \o \l {Container Commands}
+    \o \l {Document Contents Commands}
+    \o \l {Miscellaneous Commands}
+    \endlist
+
+*/
+
+/*!
+    \page 04-qdoc-commands-textformatting.html
+    \contentspage QDoc Manual - Table of Contents
+    \previouspage Markup Commands
+    \nextpage Document Structuring Commands
+
+    \title Text Formatting Commands
+
+    The text formatting commands indicate how the regular text in the
+    documentation is rendered.
+
+    \section1 Alphabetical List
+
+    \l {04-qdoc-commands-textformatting.html#backslash}{\\\\},
+    \l {04-qdoc-commands-textformatting.html#a}{\\a},
+    \l {04-qdoc-commands-textformatting.html#bold}{\\bold},
+    \l {04-qdoc-commands-textformatting.html#c}{\\c},
+    \l {04-qdoc-commands-textformatting.html#i}{\\i},
+    \l {04-qdoc-commands-textformatting.html#sub}{\\sub},
+    \l {04-qdoc-commands-textformatting.html#sup}{\\sup},
+    \l {04-qdoc-commands-textformatting.html#tt}{\\tt},
+    \l {04-qdoc-commands-textformatting.html#underline}{\\underline}
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+
+        \o \bold \\\\ \target backslash
+        \o \bold {The \\\\ command expands to a single backslash.}
+
+           QDoc commands always start with a backslash alone. To
+           display an actual backslash in the text you need to type
+           two of the kind. If you want to display two backslashes,
+           you need to type four, and so forth. For example:
+
+           \code
+           / *!
+               The \\\\ command is useful if you want a
+               backslash to appear verbatim, for example,
+               writing C:\\windows\\home\\.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               The \\\\ command is useful if you want a
+               backslash to appear verbatim, for example,
+               writing C:\\windows\\home\\.
+           \endquotation
+
+           However, if you want your text to appear in a typewriter
+           font as well, you can use the \l {c}{\\c} command instead,
+           which accepts and renders the backslash as any other
+           character. For example:
+
+           \code
+           / *!
+               The \\c command is useful if you want a
+               backslash to appear verbatim, and the word
+               that contains it written in a typewriter font,
+               like this: \c {C:\windows\home\}.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               The \\c command is useful if you want a
+               backslash to appear verbatim, and the word
+               that contains it written in a typewriter font,
+               like this: \c {C:\windows\home\}.
+           \endquotation
+
+    \row
+        \o \bold \\a \target a
+        \o \bold {The \\a command indicates that the next word
+           is a parameter when documenting functions.}
+
+           Warnings are emitted when function parameters are
+           undocumented or misspelled, so whenever you write
+           documentation for functions you should make sure you
+           mention all the parameters and precede each of these by the
+           \\a command. The parameter is then rendered in italic. For
+           example:
+
+           \code
+           / *!
+               Constructs a line edit containing the text
+               \a contents.
+
+               The \a parent parameter is sent to the
+               QWidget constructor.
+           * /
+
+           QLineEdit::QLineEdit(const QString &contents, QWidget *parent)
+               :QWidget(parent)
+           {
+               ...
+           }
+
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \bold {QLineEdit::QLineEdit ( const QString &
+               contents, QWidget *parent )}
+
+           Constructs a line edit containing the text \a contents.
+
+           The \a parent parameter is sent to the QWidget
+           constructor.
+
+           \endquotation
+
+           The \\a command follows the same conventions as the \l
+           {i}{\\i} command for \l {argument}{punctuation, parentheses
+           and use of braces} for the argument. However, a parameter
+           is always a single word, so braces are rarely
+           necessary. And for the same reason, parentheses seldom
+           occur.
+
+    \row
+        \o \bold \\c \target c
+        \o \bold {The \\c command can be used to render variables,
+           user-defined classes and C++ keywords like \c int,
+           \c for, etc.}
+
+           The command renders its argument using a typewriter font. For
+           example:
+
+           \code
+           / *!
+               The \c AnalogClock class provides a clock widget with hour
+               and minute hands that is automatically updated every
+               few seconds.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               The \c AnalogClock class provides a clock widget with hour
+               and minute hands that is automatically updated every
+               few seconds.
+           \endquotation
+
+           The \\c command follows the same conventions as the \l
+           {i}{\\i} command for \l {argument}{punctuation, parentheses
+           and use of braces} for the argument.
+
+           The \\c command accepts the special character \c \ within
+           its argument, i.e. it renders it as a normal character. So
+           if you want to use nested commands, you must use the \l
+           {tt}{teletype (\\tt)} command instead.
+
+           See also \l {tt}{\\tt} and \l {code}{\\code}.
+
+    \row
+        \o \bold \\tt \target tt
+        \o \bold {The \\tt command can be used to render variables,
+           user-defined classes and C++ keywords like \c int, \c
+           for, etc.}
+
+           The \\tt command behaves just like the \l {c}{\\c} command,
+           except that \\tt parses QDoc commands (like \l {i}{\\i}, \l
+           {bold}{\\bold} and \l {underline}{\\underline}) contained
+           within its argument.
+
+           The command renders its argument using a monospace
+           font. For example:
+
+           \code
+           / *!
+               After \c setupUi() populates the main container with
+               child widgets it scans the main container's list of
+               slots for names with the form
+               \tt{on_\i{objectName}_\i{signalName}().}
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               After \c setupUi() populates the main container with
+               child widgets it scans the main container's list of
+               slots for names with the form
+               \tt{on_\i{objectName}_\i{signalName}().}
+           \endquotation
+
+           The \\tt command follows the same conventions as the \l
+           {i}{\\i} command for \l {argument}{punctuation, parentheses
+           and use of braces} for the argument.
+
+           See also \l {c}{\\c}.
+
+    \row
+        \o \bold \\bold \target bold
+        \o \bold {The \\bold command renders its argument using
+           a bold font.}
+
+           For example:
+
+           \code
+           / *!
+               This is regular text; \bold {this text is
+               rendered using the \\bold command}.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+           This is regular text; \bold {this text is rendered using
+           the \\bold command}.
+           \endquotation
+
+           The command follows the same conventions as the \l {i}{\\i}
+           command for \l {argument}{punctuation, parentheses and use
+           of braces} for the argument.
+
+    \row
+        \o \bold \\i \target i
+        \o \bold {The \\i command renders its argument in italic.}
+
+           \warning This is preliminary functionality. For
+           more information, see the \l
+           {26-qdoc-commands-compatibility.html#i-versus-e}{compatibility}
+           section.
+
+           \target argument
+           Normally, a command argument ends at the next whitespace [1],
+           but braces can be used to group words [2]. For example:
+
+           \code
+           / *!
+               Here, we render \i {a few words} in italic.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               Here, we render \i {a few words} in italic.
+           \endquotation
+
+           If you want to use other QDoc commands within an argument
+           that contains spaces, you always need to enclose the
+           argument with braces. But QDoc is smart enough to count
+           parentheses [3], so you don't need braces in cases like this:
+
+           \code
+           / *!
+               An argument can sometimes contain whitespaces,
+               for example: \i QPushButton(tr("A Brand New Button"))
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               An argument can sometimes contain whitespaces,
+               for example: \i QPushButton(tr("A Brand New Button"))
+           \endquotation
+
+           Finally, trailing punctuation is not included in an
+           argument [4], nor is 's [5]
+
+           \raw HTML
+               <table align="center" cellpadding="2"
+                   cellspacing="1" border="0">
+               <tr valign="top" bgcolor="#a2c511">
+                   <th></th>
+                   <th>QDoc Syntax</th>
+                   <th>Generated Documentation</th>
+               </tr>
+
+               <tr valign="top" bgcolor="#d0d0d0">
+                   <td>1</td>
+                   <td>A variation of a command button is a \i menu
+                       button.</td>
+                   <td>A variation of a command button is a <i>menu</i>
+                       button.</td>
+               </tr>
+
+               <tr valign="top" bgcolor="#c0c0c0">
+                   <td>2</td>
+                   <td>The QPushButton widget provides a
+                       \i {command button}.</td>
+                   <td>The QPushButton widget provides a
+                       <i>command button</i>.</td>
+               </tr>
+
+               <tr valign="top" bgcolor="#d0d0d0">
+                   <td>3</td>
+                   <td>Another class of buttons are option buttons
+                       \i (see QRadioButton).</td>
+                   <td>Another class of buttons are option buttons
+                       <i> (see QRadioButton)</i>.</td>
+               </tr>
+
+               <tr valign="top" bgcolor="#c0c0c0">
+                   <td>4</td>
+                   <td>A push button emits the signal \i clicked().</td>
+                   <td>A push button emits the signal <i>clicked</i>().</td>
+               </tr>
+
+               <tr valign="top" bgcolor="#d0d0d0">
+                   <td>5</td>
+                   <td>The \i QPushButton's checked property is
+                       false by default.</td>
+                   <td>The <i>QPushButton</i>'s checked property is
+                       false by default.</td>
+               </tr>
+
+               </table>
+           \endraw
+
+    \row
+        \o \bold \\sub \target sub
+        \o \bold {The \\sub command renders its argument lower
+           than the baseline of the regular text, using a smaller font.}
+
+           For example:
+
+           \code
+           / *!
+               Definition (Range): Consider the sequence
+               {x\sub n}\sub {n > 1} . The set
+
+               {x\sub 2, x\sub 3, x\sub 4, ...} = {x\sub n ; n = 2, 3, 4, ...}
+
+               is called the range of the sequence.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               Definition (Range): Consider the sequence
+               {x\sub n}\sub {n > 1} . The set
+
+               {x\sub 2, x\sub 3, x\sub 4, ...} = {x\sub n ; n = 2, 3, 4, ...}
+
+               is called the range of the sequence.
+           \endquotation
+
+           The \\sub command follows the same conventions as the \l
+           {i}{\\i} command for \l {argument}{punctuation, parentheses
+           and use of braces} for the argument.
+
+    \row
+        \o \bold \\sup \target sup
+        \o \bold {The \\sup command renders its argument higher than
+           the baseline of the regular text, using a smaller font.}
+
+           For example:
+
+           \code
+           / *!
+               The series
+
+               1 + a + a\sup 2 + a\sup 3 + a\sup 4 + ...
+
+               is called the \i {geometric series}.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               The series
+
+               1 + a + a\sup 2 + a\sup 3 + a\sup 4 + ...
+
+               is called the \i {geometric series}.
+           \endquotation
+
+           The \\sup command follows the same conventions as the \l
+           {i}{\\i} command for \l {argument}{punctuation, parentheses
+           and use of braces} for the argument.
+
+    \row
+        \o \bold \\underline \target underline
+        \o \bold {The \\underline command renders its argument underlined.}
+
+           For example:
+
+           \code
+           / *!
+               The \underline {F}ile menu gives the users the possibility
+               to open, and edit, an existing file, save a new or modified
+               file, and exit the application.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               The \underline {F}ile menu gives the users the possibility
+               to open, and edit, an existing file, save a new or modified
+               file, and exit the application.
+           \endquotation
+
+           The \\underline command follows the same conventions as the
+           \l {i}{\\i} command for \l {argument}{punctuation,
+           parentheses and use of braces} for the argument.  \endtable
+*/
+
+/*!
+    \page 05-qdoc-commands-documentstructuring.html
+    \previouspage Text Formatting Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Verbatim Code Commands
+
+    \title Document Structuring Commands
+
+    The document structuring commands divide the documentation into
+    sections. In total, there are six levels of sections in QDoc: \c
+    \part, \c \chapter, \c \section1, \c \section2, \c \section3 and
+    \c \section4. \c \section1 to \c \section4 correspond to the
+    traditional section, subsection, subsubsection and
+    subsubsubsection.
+
+    \section1 Alphabetical List
+
+    \l {05-qdoc-commands-documentstructuring.html#chapter}{\\chapter},
+    \l {05-qdoc-commands-documentstructuring.html#part}{\\part},
+    \l {05-qdoc-commands-documentstructuring.html#sectionOne}{\\section1},
+    \l {05-qdoc-commands-documentstructuring.html#sectionTwo}{\\section2},
+    \l {05-qdoc-commands-documentstructuring.html#sectionThree}{\\section3},
+    \l {05-qdoc-commands-documentstructuring.html#sectionFour}{\\section4}
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\part \target part
+        \o \bold {The \\part command is intended for use in
+           larger documents, and divides the document into parts.}
+
+           In general a document structuring command considers
+           everything that follows it until the first line break as
+           its argument. The argument is rendered as the unit's
+           title. If the title needs to be spanned over several lines,
+           make sure that each line (except the last one) is ended
+           with a backslash.
+
+           In total, there are six levels of sections in QDoc: \c
+           \part, \c \chapter, \c \section1, \c \section2, \c
+           \section3 and \c \section4. \c \section1 to \c \section4
+           correspond to the traditional section, subsection,
+           subsubsection and subsubsubsection.
+
+           There is a strict ordering of the section units:
+
+           \code
+           part
+              |
+              chapter
+                    |
+                    section1
+                           |
+                           section2
+                                  |
+                                  section3
+                                         |
+                                         section4
+           \endcode
+
+           For example, a \c section1 unit can only appear as the top
+           level section or inside a \c chapter unit. Skipping a
+           section unit, for example from \c part to \c section1, is
+           not allowed.
+
+           You can \i begin with either of the three: \c part, \c
+           chapter or \c section1. For example:
+
+
+           \code
+           / *!
+               \part Basic Qt
+
+               This is the first part.
+
+
+                   \chapter Getting Started
+
+                   This is the first part's first chapter.
+
+
+                       \section1 Hello Qt
+
+                       This is the first chapter's first section.
+
+
+                       \section1 Making Connections
+
+                       This is the first chapter's second section.
+
+
+                       \section1 Using the Reference Documentation
+
+                       This is the first chapter's third section.
+
+
+                   \chapter Creating Dialogs
+
+                   This is the first part's second chapter.
+
+
+                       \section1 Subclassing QDialog
+
+                       This is the second chapter's first section.
+
+                       ...
+
+
+               \part Intermediate Qt
+
+               This is the second part.
+
+
+                   \chapter Layout Management
+
+                   This is the second part's first chapter.
+
+
+                       \section1 Basic Layouts
+
+                       This is the first chapter's first section.
+
+               ...
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+           \raw HTML
+               <a name="Basic Qt">
+               <h1>Basic Qt</h1>
+               </a>
+               <p>This is the first part.</p>
+
+                   <a name="Getting started">
+                   <h2>Getting Started</h2>
+                   </a>
+                   This is the first part's first chapter.</p>
+
+                       <a name="Hello Qt">
+                       <h3>Hello Qt</h3>
+                       </a>
+                       <p>This is the first chapter's first section.</p>
+
+                       <a name="Making Connections">
+                       <h3>Making Connections</h3>
+                       </a>
+                       <p>This is the first chapter's second section.</p>
+
+                       <a name="Using the Reference Documentation">
+                       <h3>Using the Reference Documentation</h3>
+                       </a>
+                       <p>This is the first chapter's third section.</p>
+
+                   <a name="Creating Dialogs">
+                   <h2>Creating Dialogs</h2>
+                   </a>
+                   <p>This is the first part's second chapter.</p>
+
+                       <a name="Subclassing QDialog">
+                       <h3>Subclassing QDialog</h3>
+                       </a>
+                       <p>This is the second chapter's first section.</p>
+
+                       ...
+
+               <a name="Intermediate Qt">
+               <h1>Intermediate Qt</h1>
+               </a>
+               <p>This is the second part.</p>
+
+                   <a name="Layout Management">
+                   <h2>Layout Management</h2>
+                   </a>
+                   <p>This is the second part's first chapter.</p>
+
+                       <a name="Basic Layouts">
+                       <h3>Basic Layouts</h3>
+                       </a>
+                       <p>This is the first chapter's first section.</p>
+
+               ...
+
+           \endraw
+           \endquotation
+
+           Each section level is a logical unit within the
+           document. Its title will appear on the table of contents
+           generated by the \l
+           {11-qdoc-commands-documentcontents.html#tableofcontents}
+           {\\tableofcontents} command. For example:
+
+           \code
+           / *!
+               Contents:
+
+               \tableofcontents
+
+               ...
+            * /
+            \endcode
+
+            will expand to
+
+            \quotation
+            \raw HTML
+                <p>Contents:</p>
+
+                <ul>
+                <li><a href="#Basic Qt">Basic Qt</a></li>
+                    <ul>
+                    <li><a href="#Getting Started">Getting Started</a></li>
+                        <ul>
+                        <li><a href="#Hello Qt">Hello Qt</a></li>
+                        <li><a href="#Making Connections">
+                            Making Connections</a></li>
+                        <li><a href="#Using the Reference Documentation">
+                            Using the Reference Documentation</a></li>
+                        </ul>
+                    <li><a href="#Creating Dialogs">Creating Dialogs</a></li>
+                        <ul>
+                        <li><a href="#Subclassing QDialog">
+                            Subclassing QDialog</a></li>
+                        </ul>
+                    </ul>
+                <li><a href="#Intermediate Qt">Intermediate Qt</a></li>
+                    <ul>
+                    <li><a href="#Layout Management">
+                        Layout Management</a></li>
+                        <ul>
+                        <li><a href="#Basic Layouts">Basic Layouts</a></li>
+                        </ul>
+                    </ul>
+                </ul>
+
+                ...
+            \endraw
+            \endquotation
+
+    \row
+        \o \bold \\chapter \target chapter
+        \o \bold {The \\chapter command is intended for use in
+           larger documents, and divides the document into chapters.}
+
+           See \l{part}{\\part} for an explanation of the various
+           section units, command argument and rendering.
+
+    \row
+        \o \bold \\section1 \target sectionOne
+        \o \bold {The \\section1 command starts a new section.}
+
+           See \l{part}{\\part} for an explanation of the various
+           section units, command argument and rendering.
+    \row
+        \o \bold \\section2 \target sectionTwo
+        \o \bold {The \\section2 command starts a new section.}
+
+           See \l{part}{\\part} for an explanation of the various
+           section units, command argument and rendering.
+
+    \row
+        \o \bold \\section3 \target sectionThree
+        \o \bold {The \\section3 command starts a new section.}
+
+           See \l{part}{\\part} for an explanation of the various
+           section units, command argument and rendering.
+
+    \row
+        \o \bold \\section4 \target sectionFour
+        \o \bold {The \\section4 command starts a new section.}
+
+           See \l{part}{\\part} for an explanation of the various
+           section units, command argument and rendering.
+
+    \endtable
+*/
+
+/*!
+    \page 06-qdoc-commands-verbatimcode.html
+    \previouspage Document Structuring Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Quoting External Code Commands
+
+    \title Verbatim Code Commands
+
+    The following commands are used to render verbatim code within the
+    documentation. The code is rendered on a new line, using a
+    typewriter font and the standard indentation.
+
+    \bold{Note:} Although all of these commands can be used to present
+    C++ code, the \l{07-0-qdoc-commands-quoting.html#snippet}{\\snippet}
+    and \l{07-0-qdoc-commands-quoting.html#codeline}{\\codeline} commands
+    should be used in preference to
+    the others when presenting valid code. This allows auxilliary tools
+    for Qt language bindings to substitute the relevant code snippets in
+    place of the C++ ones.
+
+    \section1 Alphabetical List
+
+    \l {06-qdoc-commands-verbatimcode.html#badcode}{\\badcode},
+    \l {06-qdoc-commands-verbatimcode.html#code}{\\code},
+    \l {06-qdoc-commands-verbatimcode.html#newcode}{\\newcode},
+    \l {06-qdoc-commands-verbatimcode.html#oldcode}{\\oldcode}
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\code \target code
+        \o \bold {The \\code command and the corresponding
+           \\endcode command delimit a piece of verbatim code.}
+
+           Whereas the \l {c}{\\c} command can be used for short code
+           fragments within a sentence, the \\code command is for
+           longer code snippets and renders the code verbatim in a
+           separate paragraph using a typewriter font and the standard
+           indentation.
+
+           When processing any of the \\code, \l {badcode}{\\badcode},
+           \l {newcode}{\\newcode} and \l {oldcode}{\\oldcode}
+           commands, QDoc basically removes all indentation that is
+           common for the verbatim code blocks within a \c{/}\c{*!} ...
+           \c{*}\c{/} comment before it adds the standard
+           indentation. For that reason the recommended style is to
+           use 8 spaces for the verbatim code contained within these
+           commands (note that this doesn't apply to externally
+           quoted code using the \l {quotefromfile}{\\quotefromfile}
+           or \l {quotefile}{\\quotefile} command).
+
+           For example:
+
+           \code
+           / *!
+               \code
+                   #include <QApplication>
+                   #include <QPushButton>
+
+                   int main(int argc, char *argv[])
+                   {
+                       ...
+                   }
+               \ endcode
+           * /
+           \endcode
+
+           will be rendered as
+
+           \code
+               #include <QApplication>
+               #include <QPushButton>
+
+               int main(int argc, char *argv[])
+               {
+                   ...
+               }
+           \endcode
+
+           Other QDoc commands are disabled within
+           \\code... \\endcode, and the special character '\\' is
+           accepted and rendered like the rest of the code.
+
+           You need to type the code manually between the \\code and
+           \\endcode commands. If you want to include code snippets
+           from a particular file, use the \l
+           {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile}
+           command instead.
+
+           See also \l {c}{\\c}, \l
+           {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile},
+           \l {badcode}{\\badcode}, \l {newcode}{\\newcode} and \l
+           {oldcode}{\\oldcode}.
+
+    \row
+        \o \bold \\badcode \target badcode
+        \o \bold {The \\badcode command and the corresponding
+           \\endcode command delimit a piece of code that doesn't
+           compile or is wrong for some other reason.}
+
+           The \\badcode command is similar the \l {code}{\\code}
+           command, but renders the code using a grey font instead of
+           black (the default).
+
+           Like the \l {code}{\\code} command, it renders its code on
+           a new line in the documentation using a typewriter font and
+           the standard indentation. For example:
+
+           \code
+           / *!
+               The statement below is rendered using the
+               regular \\code command:
+
+               \code
+                   statusbar()->message(tr("Host %1 found").arg(hostName));
+               \ endcode
+
+               While the following  statement is rendered using
+               the \\badcode command:
+
+               \badcode
+                   statusbar()->message(tr("Host" + hostName + " found"));
+               \ endcode
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               The statement below is rendered using the
+               regular \\code command:
+
+               \code
+                   statusbar()->message(tr("Host %1 found").arg(hostName));
+               \endcode
+
+               While the following  statement is rendered using
+               the \\badcode command:
+
+               \badcode
+                   statusbar()->message(tr("Host" + hostName + " found"));
+               \endcode
+           \endquotation
+
+           Other QDoc commands are disabled within
+           \\badcode... \\endcode, and the special character '\\' is
+           accepted and rendered like the rest of the code.
+
+           See also \l {code}{\\code}, \l {newcode}{\\newcode} and \l
+           {oldcode}{\\oldcode}.
+
+    \row
+        \o \bold \\newcode \target newcode
+        \o \bold {The \\newcode command, and the associated \\oldcode
+           and \\endcode commands, indicate how to port a piece of
+           code to a new version of an API.}
+
+           The \\newcode command, and its companion the \\oldcode
+           command, is a convenience combination of the \l
+           {code}{\\code} and \l {badcode}{\\badcode} commands: The
+           combination provides a text relating the two code snippets
+           to each other. The command requires a preceding \\oldcode
+           statement.
+
+           Like the \l {code}{\\code} and \l {badcode}{\\badcode}
+           commands, the \\newcode command renders its code on a new
+           line in the documentation using a typewriter font and the
+           standard indentation. For example:
+
+           \code
+           / *!
+               \oldcode
+                   if (printer->setup(parent))
+                       ...
+               \newcode
+                   QPrintDialog dialog(printer, parent);
+                       if (dialog.exec())
+                           ...
+               \ endcode
+           * /
+           \endcode
+
+           is rendered like this:
+
+           \quotation
+               \oldcode
+                   if (printer->setup(parent))
+                       ...
+               \newcode
+                   QPrintDialog dialog(printer, parent);
+                       if (dialog.exec())
+                           ...
+               \endcode
+           \endquotation
+
+           Other QDoc commands are disabled within
+           \\oldcode ... \\endcode, and the '\\' character doesn't need
+           to be escaped.
+
+    \row
+        \o \bold \\oldcode \target oldcode
+        \o \bold {The \\oldcode command requires a corresponding
+           \\newcode statement; otherwise QDoc fails to parse the command
+           and emits a warning.}
+
+           See also \l {newcode}{\\newcode} and \l {badcode}{\\badcode}.
+    \endtable
+*/
+
+/*!
+    \page 07-0-qdoc-commands-quoting.html
+    \previouspage Verbatim Code Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Linking Commands
+
+    \title Quoting External Code Commands
+
+    The following commands enable quoting from files in the
+    documentation: You can make QDoc include the complete contents of
+    a file, or you can quote specific parts of the file and skip
+    others. The typical use of the latter is to quote a file chunk by
+    chunk.
+
+    \bold{Note:} Although all of these commands can be used to present
+    C++ code, the \l{#snippet}{\\snippet} and \l{#codeline}{\\codeline}
+    commands should be used in preference to
+    the others when presenting valid code. This allows auxilliary tools
+    for Qt language bindings to substitute the relevant code snippets in
+    place of the C++ ones.
+
+    \section1 Alphabetical List
+
+    \l {07-0-qdoc-commands-quoting.html#codeline}{\\codeline},
+    \l {07-0-qdoc-commands-quoting.html#dots}{\\dots},
+    \l {07-0-qdoc-commands-quoting.html#printline}{\\printline},
+    \l {07-0-qdoc-commands-quoting.html#printto}{\\printto},
+    \l {07-0-qdoc-commands-quoting.html#printuntil}{\\printuntil},
+    \l {07-0-qdoc-commands-quoting.html#quotefile}{\\quotefile},
+    \l {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile},
+    \l {07-0-qdoc-commands-quoting.html#skipline}{\\skipline},
+    \l {07-0-qdoc-commands-quoting.html#skipto}{\\skipto},
+    \l {07-0-qdoc-commands-quoting.html#skipuntil}{\\skipuntil},
+    \l {07-0-qdoc-commands-quoting.html#snippet}{\\snippet}
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\quotefile \target quotefile
+        \o \bold {The \\quotefile command expands to the complete
+           contents of the file given as argument.}
+
+           The command considers the rest of the line as part of its
+           argument, make sure to follow the file name with a line
+           break.
+
+           The file's contents is rendered in a separate paragraph,
+           using a typewriter font and the standard indentation. The
+           code is shown verbatim.
+
+           For example:
+
+           \code
+           / *!
+               This is a simple "Hello world" example:
+
+               \quotefile examples/main.cpp
+
+               It contains only the bare minimum you need
+               to get a Qt application up and running.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               This is a simple "Hello world" example:
+
+               \quotefile examples/main.cpp
+
+               It contains only the bare minimum you need to get a Qt
+               application up and running.
+           \endquotation
+
+           \warning If you use the \l {QDoc
+           Compatibility}{compat.qdocconf} file this command is called
+           \\include.
+
+           See also \l {quotefromfile}{\\quotefromfile} and \l
+           {code}{\\code}.
+
+    \row
+        \o \bold \\quotefromfile \target quotefromfile
+        \o \bold {The \\quotefromfile command opens the file
+           given as argument for quoting.}
+
+           The command considers the rest of the line as part of its
+           argument, make sure to follow the file name with a line
+           break.
+
+           The command is intended for use when quoting parts from
+           file with the walkthrough commands: \l
+           {printline}{\\printline}, \l {printto}{\\printto}, \l
+           {printuntil}{\\printuntil}, \l {skipline}{\\skipline}, \l
+           {skipto}{\\skipto}, \l {skipuntil}{\\skipuntil}. This
+           enables you to quote specific portions of a file. For
+           example:
+
+           \code
+           / *!
+               The whole application is contained within
+               the \c main() function:
+
+               \quotefromfile examples/main.cpp
+
+               \skipto main
+               \printuntil app(argc, argv)
+
+               First we create a QApplication object using
+               the \c argc and \c argv parameters.
+
+               \skipto QPushButton
+               \printuntil resize
+
+               Then we create a QPushButton, and give it a reasonable
+               size using the QWidget::resize() function.
+
+               ...
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               The whole application is contained within
+               the \c main() function:
+
+               \quotefromfile examples/main.cpp
+
+               \skipto main
+               \printuntil app(argc, argv)
+
+               First we create a QApplication object using the \c argc
+               and \c argv parameters.
+
+               \skipto QPushButton
+               \printuntil resize
+
+               Then we create a QPushButton, and give it a reasonable
+               size using the QWidget::resize() function.
+
+               ...
+           \endquotation
+
+           (\l {Example File}{The complete example file...})
+
+           QDoc remembers which file it's quoting, and the current
+           position within that file (see \l {file}{\\printline} for
+           more information). There is no need to "close" the file.
+
+           Earlier we called this command \\quotefile. For more
+           information, see the \l
+           {26-qdoc-commands-compatibility.html#quotefromfile-versus-quotefile}
+           {compatibility} section.
+
+           See also \l {quotefile}{\\quotefile}, \l {code}{\\code} and
+           \l {dots}{\\dots}.
+
+    \row
+        \o \bold \\printline \target printline
+        \o \bold {The \\printline command expands to the line
+           from the current position to the next non-blank line of
+           the current souce file.}
+
+           To ensure that the documentation always is synchronized
+           with the source file, a substring of the line must be
+           specified as an argument to the command. Note that the
+           command considers the rest of the line as part of its
+           argument, make sure to follow the substring with a line
+           break.
+
+           The line from the source file is rendered as a separate
+           paragraph, using a typewriter font and the standard
+           indentation. The code is shown verbatim.
+
+           For example:
+
+           \code
+           / *!
+               There has to be exactly one QApplication object
+               in every GUI application that uses Qt.
+
+               \quotefromfile examples/main.cpp
+
+               \printline QApplication
+
+               This line includes the QApplication class
+               definition. QApplication manages various
+               application-wide resources, such as the
+               default font and cursor.
+
+               \printline QPushButton
+
+               This line includes the QPushButton class
+               definition. The QPushButton widget provides a command
+               button.
+
+               \printline main
+
+               The main function...
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               There has to be exactly one QApplication object
+               in every GUI application that uses Qt.
+
+               \quotefromfile examples/main.cpp
+
+               \printline QApplication
+
+               This line includes the QApplication class
+               definition. QApplication manages various
+               application-wide resources, such as the
+               default font and cursor.
+
+               \printline QPushButton
+
+               This line includes the QPushButton class
+               definition. The QPushButton widget provides a command
+               button.
+
+               \printline main
+
+               The main function...
+           \endquotation
+
+           (\l {Example File}{The complete example file...})
+
+           \target file
+
+           QDoc reads the file sequentially. To move the current
+           position forward you can use either of the \l
+           {skipline}{\\skip...} commands. To move the current
+           position backward, you can use the \l
+           {quotefromfile}{\\quotefromfile} command again.
+
+           \target substring
+
+           If the substring argument is surrounded by slashes it is
+           interpreted as a \l {regular expression}.
+
+           For example:
+
+           \code
+           / *!
+               \quotefromfile widgets/scribble/mainwindow.cpp
+
+               \skipto closeEvent
+               \printuntil /^\}/
+
+               Close events are sent to widgets that the users want to
+               close, usually by clicking \c File|Exit or by clicking
+               the \c X title bar button. By reimplementing the event
+               handler, we can intercept attempts to close the
+               application.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \quotefromfile widgets/scribble/mainwindow.cpp
+
+               \skipto closeEvent
+               \printuntil /^\}/
+
+               Close events are sent to widgets that the users want to
+               close, usually by clicking \c File|Exit or by clicking
+               the \c X title bar button. By reimplementing the event
+               handler, we can intercept attempts to close the
+               application.
+           \endquotation
+
+           (\l {widgets/scribble}{The complete example file...})
+
+           The regular expression \c /^\}/ makes QDoc print until the
+           first '}' character occurring at the beginning of the line
+           without indentation. /.../ encloses the regular expression,
+           and '^' means the beginning of the line. The '}' character
+           must be escaped since it is a special character in regular
+           expressions.
+
+           QDoc will emit a warning if the specified substring or
+           regular expression cannot be located, i.e. if the source
+           code has changed.
+
+           See also \l {printto}{\\printto} and \l
+           {printuntil}{\\printuntil}.
+
+    \row
+        \o \bold \\printto \target printto
+        \o \bold {The \\printto command expands to all the lines
+           from the current position up to and \i excluding the
+           next line containing a given substring.}
+
+           The command considers the rest of the line as part of its
+           argument, make sure to follow the substring with a line
+           break. The command also follows the same conventions for \l
+           {file}{positioning} and \l {substring}{argument} as the \l
+           {printline}{\\printline} command.
+
+           The lines from the source file are rendered in a separate
+           paragraph, using a typewriter font and the standard
+           indentation. The code is shown verbatim.
+
+           For example:
+
+           \code
+           / *!
+               The whole application is contained within the
+               \c main() function:
+
+               \quotefromfile examples/main.cpp
+               \printto hello
+
+               First we create a QApplication object using the \c argc and
+               \c argv parameters...
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               The whole application is contained within the
+               \c main() function:
+
+               \quotefromfile examples/main.cpp
+               \skipto main
+               \printto hello
+
+               First we create a QApplication object using the \c argc
+               and \c argv parameters...
+           \endquotation
+
+           (\l {Example File}{The complete example file...})
+
+           See also \l {printline}{\\printline} and \l
+           {printuntil}{\\printuntil}.
+
+    \row
+        \o \bold \\printuntil \target printuntil
+        \o \bold {The \\printuntil command expands to all the lines
+           from the current position up to and \i including the next line
+           containing a given substring.}
+
+           The command considers the rest of the line as part of its
+           argument, make sure to follow the substring with a line
+           break. The command also follows the same conventions for \l
+           {file}{positioning} and \l {substring}{argument} as the \l
+           {printline}{\\printline} command.
+
+           The lines from the source file are rendered in a separate
+           paragraph, using a typewriter font and the standard
+           indentation. The code is shown verbatim.
+
+           For example:
+
+           \code
+           / *!
+               The whole application is contained within the
+               \c main() function:
+
+               \quotefromfile examples/main.cpp
+               \skipto main
+               \printuntil hello
+
+               First we create a QApplication object using the
+               \c argc and \c argv parameters, then we create
+               a QPushButton.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               The whole application is contained within the
+               \c main() function:
+
+               \quotefromfile examples/main.cpp
+               \skipto main
+               \printuntil hello
+
+               First we create a \l
+               {http://qt.nokia.com/doc/4.0/qapplication}{QApplication}
+               object using the \c argc and \c argv parameters, then we
+               create a \l
+               {http://qt.nokia.com/doc/4.0/qpushbutton}{QPushButton}.
+           \endquotation
+
+           (\l {Example File}{The complete example file...})
+
+           See also \l {printline}{\\printline} and \l
+           {printto}{\\printto}.
+
+    \row
+        \o \bold \\skipline \target skipline
+        \o \bold {The \\skipline command ignores the next non-blank
+           line in the current source file.}
+
+           Doc reads the file sequentially, and the \\skipline command
+           is used to move the current position (omitting a line of
+           the source file). See the remark about \l {file}{file
+           positioning} above.
+
+           The command considers the rest of the line as part of its
+           argument, make sure to follow the substring with a line
+           break. The command also follows the same conventions for \l
+           {substring}{argument} as the \l {printline}{\\printline}
+           command, and it is used in conjunction with the \l
+           {quotefromfile}{\\quotefromfile} command. For example:
+
+           \code
+           / *!
+               QPushButton is a GUI push button that the user
+               can press and release.
+
+               \quotefromfile examples/main.cpp
+               \skipline QApplication
+               \printline QPushButton
+
+               This line includes the QPushButton class
+               definition. For each class that is part of the
+               public Qt API, there exists a header file of
+               the same name that contains its definition.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \l
+               QPushButton is a GUI push button that the user
+               can press and release.
+
+               \quotefromfile examples/main.cpp
+               \skipline QApplication
+               \printline QPushButton
+
+               This line includes the QPushButton class
+               definition. For each class that is part of the public
+               Qt API, there exists a header file of the same name
+               that contains its definition.
+           \endquotation
+
+           (\l {Example File}{The complete example file...})
+
+           See also \l {skipto}{\\skipto}, \l
+           {skipuntil}{\\skipuntil} and \l {dots}{\\dots}.
+
+    \row
+        \o \bold \\skipto \target skipto
+        \o \bold {The \\skipto command ignores all the lines from the
+           current position up to and \i excluding the next line
+           containing a given substring.}
+
+           QDoc reads the file sequentially, and the \\skipto command
+           is used to move the current position (omitting one or
+           several lines of the source file). See the remark about \l
+           {file}{file positioning} above.
+
+           The command considers the rest of the line as part of its
+           argument, make sure to follow the substring with a line
+           break.
+
+           The command also follows the same conventions for \l
+           {substring}{argument} as the \l {printline}{\\printline}
+           command, and it is used in conjunction with the \l
+           {quotefromfile}{\\quotefromfile} command. For example:
+
+           \code
+           / *!
+               The whole application is contained within
+               the \c main() function:
+
+               \quotefromfile examples/main.cpp
+               \skipto main
+               \printuntil }
+
+               First we create a QApplication object.  There
+               has to be exactly one such object in
+               every GUI application that uses Qt. Then
+               we create a QPushButton, resize it to a reasonable
+               size...
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               The whole application is contained within
+               the \c main() function:
+
+               \quotefromfile examples/main.cpp
+               \skipto main
+               \printuntil }
+
+               First we create a QApplication object.  There has to be
+               exactly one such object in every GUI application that
+               uses Qt. Then we create a QPushButton, resize it to a
+               reasonable size ...
+           \endquotation
+
+           (\l {Example File}{The complete example file...})
+
+           See also \l {skipline}{\\skipline}, \l
+           {skipuntil}{\\skipuntil} and \l {dots}{\\dots}.
+
+    \row
+        \o \bold \\skipuntil \target skipuntil
+        \o \bold {The \\skipuntil command ignores all the lines from
+           the current position up to and \i including the next line
+           containing a given substring.}
+
+           QDoc reads the file sequentially, and the \\skipuntil
+           command is used to move the current position (omitting one
+           or several lines of the source file). See the remark about
+           \l {file}{file positioning} above.
+
+           The command considers the rest of the line as part of its
+           argument, make sure to follow the substring with a line
+           break.
+
+           The command also follows the same conventions for \l
+           {substring}{argument} as the \l {printline}{\\printline}
+           command, and it is used in conjunction with the \l
+           {quotefromfile}{\\quotefromfile} command. For example:
+
+           \code
+           / *!
+               The first thing we did in the \c main() function
+               was to create a QApplication object \c app.
+
+               \quotefromfile examples/main.cpp
+               \skipuntil show
+               \dots
+               \printuntil }
+
+               In the end we must remember to make \c main() pass the
+               control to Qt. QCoreApplication::exec() will return when
+               the application exits...
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               The first thing we did in the \c main() function was to
+               create a QApplication object \c app.
+
+               \quotefromfile examples/main.cpp
+               \skipuntil show
+               \dots
+               \printuntil }
+
+               In the end we must remember to make \c main() pass the
+               control to Qt. QCoreApplication::exec()
+               will return when the application exits...
+           \endquotation
+
+           (\l {Example File}{The complete example file...})
+
+           See also \l {skipline}{\\skipline}, \l {skipto}{\\skipto}
+           and \l {dots}{\\dots}.
+
+    \row
+        \o \bold \\dots \target dots
+        \o \bold {The \\dots command indicates that parts of the
+           source file have been omitted when quoting a file.}
+
+           The command is used in conjunction with the \l
+           {quotefromfile}{\\quotefromfile} command, and should be
+           stated on its own line. The dots are rendered on a new
+           line, using a typewriter font. For example:
+
+           \code
+           / *!
+               \quotefromfile examples/main.cpp
+               \skipto main
+               \printuntil {
+               \dots
+               \skipuntil exec
+               \printline }
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotefromfile examples/main.cpp
+           \skipto main
+           \printuntil {
+           \dots
+           \skipuntil exec
+           \printline }
+
+           (\l {Example File}{The complete example file...})
+
+           The default indentation is 4 spaces, but this can be
+           adjusted using the command's optional argument. For
+           example:
+
+            \code
+           / *!
+               \dots 0
+               \dots
+               \dots 8
+               \dots 12
+               \dots 16
+           * /
+           \endcode
+
+           will be rendered as
+
+           \dots 0
+           \dots
+           \dots 8
+           \dots 12
+           \dots 16
+
+           See also \l {skipline}{\\skipline}, \l
+           {skipto}{\\skipto} and \l {skipuntil}{\\skipuntil}.
+
+    \row
+        \o \bold \\snippet \target snippet
+        \o \bold {The \\snippet command causes a code snippet to be included
+           verbatim as preformatted text, which may be syntax highlighted.}
+           
+           Each code snippet are referenced by the file that holds it and by
+           a unique identifier for that file. Snippet files are typically
+           stored in a \c{snippets} directory inside the documentation
+           directory (e.g., \c{$QTDIR/doc/src/snippets}).
+
+           For example, the following documentation references a snippet in
+           a file residing in a subdirectory of the documentation directory:
+           
+           \code
+           \snippet snippets/textdocument-resources/main.cpp Adding a resource
+           \endcode
+           
+           The text following the file name is the unique identifier for the
+           snippet. This is used to delimit the quoted code in the relevant
+           snippet file as shown in the following example that corresponds to
+           the above \c{\\snippet} command:
+           
+           \dots
+           \code
+               QImage image(64, 64, QImage::Format_RGB32);
+               image.fill(qRgb(255, 160, 128));
+
+           //! [Adding a resource]
+               document->addResource(QTextDocument::ImageResource,
+                   QUrl("mydata://image.png"), QVariant(image));
+           //! [Adding a resource]
+           \endcode
+           \dots
+    \row
+        \o \bold \\codeline \target codeline
+        \o \bold{The \\codeline command inserts a blank line of preformatted
+           text. It is used to insert gaps between snippets without closing
+           the current preformatted text area and opening a new one.}
+    \endtable
+*/
+
+/*!
+    \page  07-1-example.html
+    \previouspage Quoting External Code Commands
+    \contentspage QDoc Manual - Table of Contents
+
+    \title Example File
+
+    \quotefile examples/main.cpp
+*/
+
+/*!
+    \page 08-qdoc-commands-linking.html
+    \previouspage Quoting External Code Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Graphic Commands
+
+    \title Linking Commands
+
+    The linking commands make it possible to create hyperlinks to
+    classes, functions, header files and examples. They also make it
+    possible to link to targets within a document, as well as to other
+    documents and URLs.
+
+    \section1 Alphabetical List
+
+    \l {08-qdoc-commands-linking.html#keyword}{\\keyword},
+    \l {08-qdoc-commands-linking.html#l}{\\l},
+    \l {08-qdoc-commands-linking.html#sa}{\\sa},
+    \l {08-qdoc-commands-linking.html#target}{\\target}
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\l \target l
+        \o \bold {The \\l command is used to create hyperlinks. }
+
+           The command's general syntax is
+
+           \code
+           \l {link target}{link text}
+           \endcode
+
+           For example:
+
+           \code
+           / *!
+               Read the \l {http://qt.nokia.com/doc/4.0/}
+               {Qt's Reference Documentation} carefully.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+              Read the \l {http://qt.nokia.com/doc/4.0/}
+              {Qt's Reference Documentation} carefully.
+           \endquotation
+
+           If the link target is equivalent to the link text, the
+           second argument can be omitted.
+
+           For example, if you have documentation like:
+
+           \code
+           / *!
+               \target assertions
+
+               Assertions make some statement about the text at the
+               point where they occur in the regexp but they do not
+               match any characters.
+
+               ...
+
+               Regexps are built up from expressions, quantifiers, and
+               \l {assertions}{assertions}.
+           * /
+           \endcode
+
+           you can rewrite it as
+
+           \code
+           / *!
+               \target assertions
+
+               Assertions make some statement about the text at the
+               point where they occur in the regexp but they do not
+               match any characters.
+
+               ...
+
+               Regexps are built up from expressions, quantifiers, and
+               \l assertions.
+           * /
+           \endcode
+
+           For the one-parameter version the braces can often
+           be omitted. See the \l {i}{\\i} command for the \l
+           {argument}{argument conventions}.
+
+           The \\l command supports several kinds of links:
+
+           \list
+           \o \c {\l QWidget} - a defined \l {class}{\\class}
+           \o \c {\l QWidget::sizeHint()} - a defined member
+               function (\l {fn}{\\fn})
+           \o \c {\l <QtGlobal>} - a defined \l {headerfile}{\\headerfile}
+           \o \c {\l widgets/wiggly} - a defined
+              \l {example-command}{\\example}
+           \o \c {\l {QWidget Class Reference}} - a defined \l {title}{\\title}
+           \o \c {\l {Introduction}}- a defined \l{part}{\\part},
+              \l{chapter}{\\chapter} or \l {sectionOne}{\\section...}
+           \o \c {\l fontmatching} - a defined \l {target}{\\target}
+           \o \c {\l {Shared Classes}} - a defined \l {keyword}{\\keyword}
+           \o \c {\l network.html} - a defined \l {page}{\\page}
+           \o \c {\l http://www.trolltech.com/} - a URL
+           \endlist
+
+           QDoc also tries to make a link out of any words that don't
+           resemble any normal English words, for example Qt class
+           names or functions, like QWidget or QWidget::sizeHint(). In
+           these cases, the \\l command can actually be omitted, but
+           by using the command, you ensure that QDoc will emit a
+           warning if it cannot find the link target. In addition, if
+           you only want the function name to appear in the link, you
+           can use the following syntax:
+
+           \list
+               \o \c {\l {QWidget::}{sizeHint()}}
+           \endlist
+
+           See also \l {sa}{\\sa}, \l {target}{\\target} and \l
+           {keyword}{\\keyword}.
+
+    \row
+        \o \bold \\sa \target sa
+        \o \bold {The \\sa command defines a list of links that will
+           be rendered in a separate "See also" section at the bottom
+           of the documentation.}
+
+           The command takes a comma-separated list of links as its
+           argument. If the line ends with a comma, you can continue
+           on a second line.  The general syntax is:
+
+           \code
+           \sa {the first link}, {the second link},
+               {the third link}, ...
+           \endcode
+
+           QDoc will automatically try to generate "See also" links
+           interconnecting a property's various functions. For
+           example, an setVisible() function will automatically get a
+           link to visible() and vice versa.
+
+           In general, QDoc will generate "See also" links that
+           interconnect the functions that access the same
+           property. It recognizes four different syntax versions:
+
+           \list
+           \o \c property()
+           \o \c setProperty()
+           \o \c isProperty()
+           \o \c hasProperty()
+           \endlist
+
+           The \\sa command supports the same kind
+           of links as the \l {l}{\\l} command. For example:
+
+           \code
+           / *!
+               Appends the actions \a actions to this widget's
+               list of actions.
+
+               \sa removeAction(), QMenu, addAction()
+           * /
+           void QWidget::addActions(QList<QAction *> actions)
+           {
+           ...
+           }
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \bold {void QWidget::addActions ( QList<QAction*>
+               \i actions )}
+
+               Appends the actions \i actions to this widget's
+               list of actions.
+
+               See also \l {QWidget::removeAction()}{removeAction()},
+               \l QMenu, and \l {QWidget::addAction()}{addAction()}.
+           \endquotation
+
+           See also \l {l}{\\l}, \l {target}{\\target} and \l
+           {keyword}{\\keyword}.
+
+    \row
+        \o \bold \\target \target target
+        \o \bold {The \\target command defines an explicit point in the
+           documentation that you can later link to using the \l {l}{\\l}
+           and \l {sa}{\\sa} commands.}
+
+           The command considers the rest of the line as part of its
+           argument, make sure to follow the target name with a line
+           break.
+
+           For example:
+
+           \code
+           / *!
+               \target capturing parentheses
+               \section1 Capturing Text
+
+               Parentheses allow us to group elements together so that
+               we can quantify and capture them.
+
+               ...
+           * /
+           \endcode
+
+           can be referenced with
+
+           \list
+           \o \c {\l {capturing parentheses}}
+              (from elsewhere in the same comment)
+           \o \c {\l qregexp.html#capturing-parentheses}
+              (from anywhere else)
+           \endlist
+
+           within a documentation unit, and with
+
+           \list
+           \o \c {\l http://www.trolltech.com/4.0/doc/html/qregexp.html#capturing-parentheses}
+           \endlist
+
+           on a more global scale.
+
+           If the target name does't contain any spaces, the brackets can
+           be omitted as well.
+
+           See also \l {l}{\\l}, \l {sa}{\\sa} and \l
+           {keyword}{\\keyword}.
+
+    \row
+        \o \bold \\keyword \target keyword
+        \o \bold {The \\keyword command defines an explicit point in the
+           documentation that you can later link to using the \l {l}{\\l}
+           and \l {sa}{\\sa} commands.}
+
+           Keywords must be unique within the entire set of
+           documentation processed in on QDoc run.  The command
+           considers the rest of the line as part of its argument,
+           make sure to follow the keyword with a line break.
+
+           The \\keyword command is similar to \l {target}{\\target},
+           but stronger.  A keyword can be referenced from anywhere
+           using a simple syntax. For example:
+
+           \code
+           / *!
+               \class QRegExp
+               \reentrant
+               \brief The QRegExp class provides pattern
+                      matching using regular expressions.
+               \ingroup tools
+               \ingroup misc
+               \ingroup shared
+               \mainclass
+
+               \keyword regular expression
+
+               Regular expressions, or "regexps", provide a way to
+               find patterns within text.
+
+               ...
+           * /
+           \endcode
+
+           can be referenced like this
+
+           \code
+           / *!
+               When a string is surrounded by slashes, it's
+               interpreted as a \l regular expression.
+           * /
+           \endcode
+
+           which will be rendered as
+
+           \quotation
+               When a string is surrounded by slashes, it's
+               interpreted as a \l {regular expression}.
+           \endquotation
+
+           If the keyword does't contain any spaces, the brackets can
+           be omitted as well.
+
+           See also \l {l}{\\l}, \l {sa}{\\sa} and \l
+           {target}{\\target}.
+    \endtable
+*/
+
+/*!
+    \page 09-qdoc-commands-graphic.html
+    \previouspage Linking Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Container Commands
+
+    \title Graphic Commands
+
+    The graphic commands makes it possible to include images in the
+    documentation. The images can be rendered as separate paragraphs,
+    or within running text.
+
+    \section1 Alphabetical List
+
+    \l {09-qdoc-commands-graphic.html#caption}{\\caption},
+    \l {09-qdoc-commands-graphic.html#image}{\\image},
+    \l {09-qdoc-commands-graphic.html#inlineimage}{\\inlineimage}
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\image \target image
+        \o \bold {The \\image command expands to the image specified by its
+           argument, and renders it centered as a separate paragraph.}
+
+           The \\image command replaces the old \\img command. For more
+           information, see the \l
+           {26-qdoc-commands-compatibility.html#image-versus-img}
+           {compatibility} section.
+
+           The command takes two arguments. The first is the name of
+           the image file. The second argument is optional and is a
+           simple description of the image equivalent to the HTML
+           alt="" in an image tag. The description is used for
+           tooltips, and when a browser doesn't support images like
+           the Lynx text browser.
+
+           The command considers the rest of the line after the file
+           name its second argument, make sure that you follow the
+           filename or description with a line break. Braces are only
+           necessary if the description spans several lines.
+
+           For example:
+
+           \code
+           / *!
+               Qt by Trolltech is a C++ toolkit for cross-platform GUI
+               application development.
+
+               \image happyguy.jpg "Happy guy"
+
+               Qt provides single-source portability across Microsoft
+               Windows, Mac OS X, Linux, and all major commercial Unix
+               variants. It is also available for embedded devices.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               Qt by Trolltech is a C++ toolkit for cross-platform GUI
+               application development.
+
+               \image happyguy.jpg image "Happy guy"
+
+               Qt provides single-source portability across Microsoft
+               Windows, Mac OS X, Linux, and all major commercial Unix
+               variants. It is also available for embedded devices.
+           \endquotation
+
+           See also \l {inlineimage}{\\inlineimage} and \l
+           {caption}{\\caption}.
+
+    \row
+        \o \bold \\inlineimage \target inlineimage
+        \o \bold {The \\inlineimage command expands to the image
+           specified by its argument; the image is rendered inline
+           with the rest of the text.}
+
+           The command takes two arguments. The first is the name of
+           the image file. The second argument is optional and is a
+           simple description of the image equivalent to the HTML
+           alt="" in an image tag. The description is used for
+           tooltips, and when a browser doesn't support images like
+           the Lynx text browser.
+
+           The most common use of the \\inlineimage command is in
+           lists and tables. For example:
+
+           \code
+           / *!
+               \list 1
+               \o \inlineimage happy.gif Oh so happy!
+               \o \inlineimage happy.gif Oh so happy!
+               \o \inlineimage happy.gif Oh so happy!
+               \endlist
+           * /
+           \endcode
+
+           will be rendered as
+
+           \list 1
+           \o \inlineimage happy.gif Oh so happy!
+           \o \inlineimage happy.gif Oh so happy!
+           \o \inlineimage happy.gif Oh so happy!
+           \endlist
+
+           And
+
+           \code
+           / *!
+               \table
+               \header
+                   \o Trolltech
+                   \o Trolltech
+               \row
+                   \o \inlineimage happy.gif Oh so happy!
+                   \o \inlineimage happy.gif Oh so happy!
+               \row
+                   \o \inlineimage happy.gif Oh so happy!
+                   \o \inlineimage happy.gif Oh so happy!
+               \endtable
+           * /
+           \endcode
+
+           will be rendered as
+
+           \raw HTML
+               <table align="center" cellpadding="2"
+                   cellspacing="1" border="0">
+               <tr valign="top" bgcolor="#a2c511">
+                   <th>Trolltech</th>
+                   <th>Trolltech</th>
+               </tr>
+
+               <tr valign="top" bgcolor="#f0f0f0">
+                   <td><img src="images/happy.gif" alt="Oh so happy!" />
+                   </td>
+                   <td><img src="images/happy.gif" alt="Oh so happy!" />
+                   </td>
+               </tr>
+
+               <tr valign="top" bgcolor="#f0f0f0">
+                   <td><img src="images/happy.gif" alt="Oh so happy!"/>
+                   </td>
+                   <td><img src="images/happy.gif" alt="Oh so happy!" />
+                   </td>
+               </tr>
+
+               </table>
+           \endraw
+
+           The command can also be used to insert an image
+           inline with the regular text. For example:
+
+           \code
+           / *!
+               \inlineimage training.jpg Training by Trolltech
+               The Qt Programming course is offered as a
+               five day Open Enrollment Course. The classes
+               are open to the public.While the course is open
+               to anyone who wants to learn, attendees should
+               have significant experience in C++ development
+               to derive maximum benefit from the course.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \inlineimage training.jpg Training by Trolltech
+               The Qt Programming course is offered as a
+               five day Open Enrollment Course. The classes
+               are open to the public.While the course is open
+               to anyone who wants to learn, attendees should
+               have significant experience in C++ development
+               to derive maximum benefit from the course.
+           \endquotation
+
+           See also \l {image}{\\image} and \l {caption}{\\caption}.
+
+    \row
+        \o \bold \\caption \target caption
+        \o \bold {The \\caption command provides a caption for an image.}
+
+           The command follows the same conventions for parentheses and use
+           of braces for its \l argument as the \l {i}{\\i} command.
+
+           \warning This is preliminary functionality. The
+           command is not fully implemented.
+
+           See also \l {image}{\\image} and \l
+           {inlineimage}{\\inlineimage}
+
+    \endtable
+*/
+
+/*!
+    \page 10-qdoc-commands-container.html
+    \previouspage Graphic Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Document Contents Commands
+
+    \title Container Commands
+
+    The container commands create tables and lists with associated
+    items and contents. A list is rendered left aligned as a separate
+    paragraph. A table is rendered centered as a separate paragraph,
+    and its width depends on its content.
+
+   \section1 Alphabetical List
+
+    \l {10-qdoc-commands-container.html#header}{\\header},
+    \l {10-qdoc-commands-container.html#list}{\\list},
+    \l {10-qdoc-commands-container.html#o}{\\o},
+    \l {10-qdoc-commands-container.html#omitvalue}{\\omitvalue},
+    \l {10-qdoc-commands-container.html#row}{\\row},
+    \l {10-qdoc-commands-container.html#table}{\\table},
+    \l {10-qdoc-commands-container.html#value}{\\value}
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\table \target table
+        \o \bold {The \\table command and the corresponding \\endtable
+           command delimit the contents of a table.}
+
+           The command accepts a single argument specifying the
+           table's width in percentage:
+
+           \code
+           / *!
+               \table 100 %
+
+                  ...
+
+               \endtable
+           * /
+           \endcode
+
+           The code above ensures that the table will fill all
+           available space. If the table's width is smaller than 100 %,
+           the table will be centered in the generated documentation.
+
+           A table can contain headers, rows and columns. A row starts
+           with a \l {row}{\\row} command and consists of cells, which
+           starts with a \l {o}{\\o} command. There is also a \l
+           {header}{\\header} command which is a special kind of row
+           with a special formatting. For example:
+
+           \code
+           / *!
+               \table
+               \header
+                   \o Qt Core Feature
+                   \o Brief Description
+               \row
+                   \o \l {Signal and Slots}
+                   \o Signals and slots are used for communication
+                      between objects.
+               \row
+                   \o \l {Layout Management}
+                   \o The Qt layout system provides a simple
+                      and powerful way of specifying the layout
+                      of child widgets.
+               \row
+                   \o \l {Drag and Drop}
+                   \o Drag and drop provides a simple visual
+                      mechanism which users can use to transfer
+                      information between and within applications.
+               \endtable
+           * /
+           \endcode
+
+           will be rendered as
+
+           \raw HTML
+               <table align="center" cellpadding="2"
+                   cellspacing="1" border="0">
+               <tr valign="top" bgcolor="#a2c511">
+                   <th>Qt Core Feature</th>
+                   <th>Brief Description</th>
+               </tr>
+
+               <tr valign="top" bgcolor="#d0d0d0">
+                   <td>
+                   <a href="http://qt.nokia.com/doc/4.0/signalsandslots.html">
+                       Signals and Slots</a>
+                   </td>
+                   <td>Signals and slots are used for communication
+                       between objects.</td>
+               </tr>
+
+               <tr valign="top" bgcolor="#c0c0c0">
+                   <td>
+                   <a href=http://qt.nokia.com/doc/4.0/layout.html">
+                       Layout Management</a></td>
+                   <td>The Qt layout system provides a simple
+                       and powerful way of specifying the layout
+                       of child widgets.</td>
+               </tr>
+
+               <tr valign="top" bgcolor="#d0d0d0">
+                   <td>
+                   <a href=http://qt.nokia.com/doc/4.0/dnd.html">
+                       Drag and Drop</a></td>
+                   <td>Drag and drop provides a simple visual
+                       mechanism which users can use to transfer
+                       information between and within applications.</td>
+               </tr>
+
+               </table>
+           \endraw
+
+           You can also make cells span several rows and columns. For
+           example:
+
+           \code
+           / *!
+               \table
+               \header
+                   \o {3,1} This header cell spans three columns
+                      but only one row.
+               \row
+                   \o {2, 1} This table cell spans two columns
+                      but only one row
+                   \o {1, 2} This table cell spans only one column,
+                   but two rows.
+               \row
+                   \o A regular table cell
+                   \o A regular table cell
+               \endtable
+           * /
+           \endcode
+
+           will be rendered as
+
+           \raw HTML
+               <table align="center" cellpadding="2" cellspacing="1"
+                border="0">
+
+               <tr valign="top" bgcolor="#a2c511">
+                   <th colspan="3" rowspan=" 1">
+                   This header cell spans three columns but only one row
+                   </th>
+               </tr>
+
+               <tr valign="top" bgcolor="#d0d0d0">
+                   <td colspan="2" rowspan=" 1">
+                   This table cell spans two columns but only one row
+                   </td>
+                   <td rowspan=" 2">
+                   This table cell spans only one column, but two rows.
+                   </td>
+               </tr>
+
+               <tr valign="top" bgcolor="#c0c0c0">
+                   <td>A regular table cell</td>
+                   <td>A regular table cell</td>
+               </tr>
+
+               </table>
+           \endraw
+
+           See also \l {header}{\\header}, \l {row}{\\row} and \l {o}{\\o}.
+
+    \row
+        \o \bold \\header \target header
+        \o \bold {The \\header command indicates that the following
+           table cells are the current table's column headers.}
+
+           The command can only be used within the \l{table}
+           {\\table...\\endtable} commands. A header can contain
+           several cells. A cell is created with the \l {o}{\\o}
+           command.
+
+           A header cell's text is centered within the table cell and
+           rendered using a bold font. For example:
+
+           \code
+           / *!
+               \table
+               \header
+                   \o Qt Core Feature
+                   \o Brief Description
+               \row
+                   \o \l {Signal and Slots}
+                   \o Signals and slots are used for communication
+                      between objects.
+               \endtable
+           * /
+           \endcode
+
+           will be rendered as
+
+           \raw HTML
+               <table align="center" cellpadding="2"
+                   cellspacing="1" border="0">
+               <tr valign="top" bgcolor="#a2c511">
+                   <th>Qt Core Feature</th>
+                   <th>Brief Description</th>
+               </tr>
+
+               <tr valign="top" bgcolor="#d0d0d0">
+                   <td>
+                   <a href="http://qt.nokia.com/doc/4.0/signalsandslots.html">
+                       Signals and Slots</a>
+                   </td>
+                   <td>Signals and slots are used for communication
+                       between objects.</td>
+               </tr>
+               </table>
+           \endraw
+
+           See also \l {table}{\\table}, \l {row}{\\row} and \l {o}{\\o}.
+
+    \row
+        \o \bold \\row \target row
+        \o \bold {The \\row command indicates that the following table
+           cells belong to the same row in the current table.}
+
+           The command can only be used within the \l{table}
+           {\\table...\\endtable} commands. A row can contain
+           several cells. A cell is created with the \l {o}{\\o}
+           command.
+
+           The background cell color of each row alternate between two
+           shades of grey, making it easier to distinguish the rows
+           from each other. The cells' contents is left aligned.
+
+           For example:
+
+           \code
+           / *!
+               \table
+               \header
+                   \o Qt Core Feature
+                   \o Brief Description
+               \row
+                   \o \l {Signal and Slots}
+                   \o Signals and slots are used for communication
+                      between objects.
+               \row
+                   \o \l {Layout Management}
+                   \o The Qt layout system provides a simple
+                      and powerful way of specifying the layout
+                      of child widgets.
+               \row
+                   \o \l {Drag and Drop}
+                   \o Drag and drop provides a simple visual
+                      mechanism which users can use to transfer
+                      information between and within applications.
+               \endtable
+           * /
+           \endcode
+
+           will be rendered as
+
+           \raw HTML
+               <table align="center" cellpadding="2"
+                   cellspacing="1" border="0">
+               <tr valign="top" bgcolor="#a2c511">
+                   <th>Qt Core Feature</th>
+                   <th>Brief Description</th>
+               </tr>
+
+               <tr valign="top" bgcolor="#d0d0d0">
+                   <td>
+                   <a href="http://qt.nokia.com/doc/4.0/signalsandslots.html">
+                       Signals and Slots</a>
+                   </td>
+                   <td>Signals and slots are used for communication
+                       between objects.</td>
+               </tr>
+
+               <tr valign="top" bgcolor="#c0c0c0">
+                   <td>
+                   <a href=http://qt.nokia.com/doc/4.0/layout.html">
+                       Layout Management</a></td>
+                   <td>The Qt layout system provides a simple
+                       and powerful way of specifying the layout
+                       of child widgets.</td>
+               </tr>
+
+               <tr valign="top" bgcolor="#d0d0d0">
+                   <td>
+                   <a href=http://qt.nokia.com/doc/4.0/dnd.html">
+                       Drag and Drop</a></td>
+                   <td>Drag and drop provides a simple visual
+                       mechanism which users can use to transfer
+                       information between and within applications.</td>
+               </tr>
+
+               </table>
+           \endraw
+
+           See also \l {table}{\\table}, \l {header}{\\header} and \l
+           {o}{\\o}.
+
+    \row
+        \o \bold \\value \target value
+        \o \bold {The \\value command starts the documentation of a C++ enum
+           item}.
+
+           The command's first argument is the enum item. Then follows
+           its associated description. The description argument ends
+           at the next blank line or \\value. The arguments are
+           rendered within a table.
+
+           The documentation will be located in the associated class,
+           header file or namespace documentation. See the \l
+           {enum}{\\enum} documentation for an example.
+
+           See also \l {enum}{\\enum} and \l {omitvalue}{\\omitvalue}.
+
+    \row
+        \o \bold \\omitvalue \target omitvalue
+        \o \bold {The \\omitvalue command excludes a C++ enum item
+           from the documentation}.
+
+           The command's only argument is the name of the enum item
+           that will be omitted. See the \l {enum}{\\enum}
+           documentation for an example.
+
+           See also \l {enum}{\\enum} and \l {value}{\\value}.
+
+    \row
+        \o \bold \\list \target list
+        \o \bold {The \\list command and the corresponding \\endlist
+           command delimit a list of items.}
+
+           You need to create each list item explicitly using the \l
+           {o}{\\o} command. A list can contain one or more items; it
+           can also be nested. For example:
+
+           \code
+           / *!
+               \list
+               \o Qt Reference Documentation: Getting Started
+                   \list
+                   \o How to Learn Qt
+                   \o Installation
+                       \list
+                       \o Qt/X11
+                       \o Qt/Windows
+                       \o Qt/Mac
+                       \o Qt/Embedded
+                       \endlist
+                   \o Tutorial and Examples
+                   \endlist
+               \endlist
+           * /
+           \endcode
+
+           will be rendered as
+
+           \list
+           \o Qt Reference Documentation: Getting Started
+               \list
+               \o How to Learn Qt
+               \o Installation
+                   \list
+                   \o Qt/X11
+                   \o Qt/Windows
+                   \o Qt/Mac
+                   \o Qt/Embedded
+                   \endlist
+               \o Tutorial and Examples
+               \endlist
+           \endlist
+
+           The \\list command takes an optional argument providing
+           alternative appearances for the list items. For example:
+
+           \code
+           / *!
+               \list
+                   \o How to Learn Qt
+                   \o Installation
+                   \o Tutorial and Examples
+               \endlist
+           * /
+           \endcode
+
+           will render the list items with bullets (the default):
+
+           \list
+               \o How to Learn Qt
+               \o Installation
+               \o Tutorial and Examples
+           \endlist
+
+           If you provide 'A' as an argument to the \\list command,
+           the bullets are replaced with characters following in
+           alphabetical order:
+
+           \list A
+               \o How to Learn Qt
+               \o Installation
+               \o Tutorial and Examples
+           \endlist
+
+           If you replace 'A' with '1', the list items are rendered
+           with numbers following in ascending order:
+
+           \list 1
+               \o How to Learn Qt
+               \o Installation
+               \o Tutorial and Examples
+
+           \endlist
+
+           If you provide 'i' as the argument, the default bullets are
+           replaced with roman numerals:
+
+           \list i
+               \o How to Learn Qt
+               \o Installation
+               \o Tutorial and Examples
+           \endlist
+
+           Or finally, you can make the list items appear with roman
+           numbers following in ascending order if you provide 'I' as
+           the optional argument:
+
+           \list I
+               \o How to Learn Qt
+               \o Installation
+               \o Tutorial and Examples
+           \endlist
+
+           You can also make the listing start at any character or
+           number by simply provide the number or character you want
+           to start at. For example:
+
+           \code
+           / *!
+               \list G
+                   \o How to Learn Qt
+                   \o Installation
+                   \o Tutorial and Examples
+               \endlist
+           * /
+           \endcode
+
+           will be rendered as
+
+           \list G
+               \o How to Learn Qt
+               \o Installation
+               \o Tutorial and Examples
+           \endlist
+
+           See also \l {o}{\\o}.
+
+    \row
+        \o \bold \\o \target o
+        \o \bold {The \\o command announce a table or list item.}
+
+           Earlier we used the \l {i}{\\i} command for this purpose. For more
+           information see the \l
+           {26-qdoc-commands-compatibility.html#o-versus-i}{compatibility}
+           section.
+
+           The command can only be used within the \l{table}
+           {\\table...\\endtable} or \l{list}{\\list... \\endlist}
+           commands.
+
+           It considers everything until the next occurrence
+           of the \\o command, or the currently applicable \l
+           {table}{\\endtable} or \l {list}{\\endlist} command, as its
+           argument. For examples, see \l {table}{\\table} and \l
+           {list}{\\list}.
+
+           If the command is used within a table, you can in addition
+           specify how many rows or columns the item should span. For
+           example:
+
+           \code
+           / *!
+               \table
+               \header
+                   \o {3,1} This header cell spans three columns
+                      but only one row.
+               \row
+                   \o {2, 1} This table item spans two columns
+                      but only one row
+                   \o {1, 2} This table item spans only one column,
+                   but two rows.
+               \row
+                   \o A regular table item
+                   \o A regular table item
+               \endtable
+           * /
+           \endcode
+
+           will be rendered as
+
+           \raw HTML
+               <table align="center" cellpadding="2" cellspacing="1"
+                border="0">
+
+               <tr valign="top" bgcolor="#a2c511">
+                   <th colspan="3" rowspan=" 1">
+                   This header cell spans three columns but only one row
+                   </th>
+               </tr>
+
+               <tr valign="top" bgcolor="#d0d0d0">
+                   <td colspan="2" rowspan=" 1">
+                   This table item spans two columns but only one row
+                   </td>
+                   <td rowspan=" 2">
+                   This table item spans only one column, but two rows.
+                   </td>
+               </tr>
+
+               <tr valign="top" bgcolor="#c0c0c0">
+                   <td>A regular table item</td>
+                   <td>A regular table item</td>
+               </tr>
+
+               </table>
+           \endraw
+
+           If not specified, the item will span one column and one row.
+
+           See also \l {table}{\\table}, \l {header}{\\header},
+           \l {list}{\\list} and \l {o}{\\o}.
+    \endtable
+*/
+
+/*!
+    \page 11-qdoc-commands-documentcontents.html
+    \previouspage Container Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Miscellaneous Commands
+
+    \title Document Contents Commands
+
+    The document contents commands identify parts of the documentation,
+    i.e. parts with a special rendering, conceptual meaning or
+    function.
+
+    \section1 Alphabetical List
+
+    \l {11-qdoc-commands-documentcontents.html#abstract}{\\abstract},
+    \l {11-qdoc-commands-documentcontents.html#brief}{\\brief},
+    \l {11-qdoc-commands-documentcontents.html#footnote}{\\footnote},
+    \l {11-qdoc-commands-documentcontents.html#legalese}{\\legalese},
+    \l {11-qdoc-commands-documentcontents.html#tableofcontents}
+       {\\tableofcontents},
+    \l {11-qdoc-commands-documentcontents.html#quotation}{\\quotation},
+    \l {11-qdoc-commands-documentcontents.html#warning}{\\warning}
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\abstract \target abstract
+        \o \bold {The \\abstract command and the corresponding \\endabstract
+           command delimit a document's abstract section.}
+
+           The abstract section is rendered as an indented italicized
+           paragraph.
+
+           \warning This is preliminary funcionality. The
+           command is not fully implemented. Currently, the abstract
+           section is rendered as a regular HTML paragraph. For
+           example:
+
+           \code
+           / *!
+               \abstract
+                   Qt by Trolltech is a C++ toolkit for cross-platform
+                   GUI application development. Qt provides
+                   single-source portability across Microsoft Windows,
+                   Mac OS X, Linux, and all major commercial Unix
+                   variants. It is also available for embedded
+                   devices.
+               \endabstract
+           * /
+           \endcode
+
+           will be rendered as
+
+           \abstract
+              Qt by Trolltech is a C++ toolkit for cross-platform GUI
+              application development. Qt provides single-source
+              portability across Microsoft Windows, Mac OS X, Linux,
+              and all major commercial Unix variants. It is also
+              available for embedded devices.
+           \endabstract
+
+    \row
+        \o \bold \\quotation \target quotation
+        \o \bold { The \\quotation command and the corresponding
+           \\endquotation command delimit a quotation remark.}
+
+           This command replaces the old \\quote command. For more
+           information see the \l
+           {26-qdoc-commands-compatibility.html#quotation-versus-quote}
+           {compatibility} section.
+
+           The remark is rendered as a separate centered
+           paragraph. For example:
+
+           \code
+           / *!
+               While the prospect of a significantly broader market is
+               good news for Firstlogic, the notion also posed some
+               challenges. Dave Dobson, director of technology for the La
+               Crosse, Wisconsin-based company, said:
+
+
+               \quotation
+                   As our solutions were being adopted into new
+                   environments, we saw an escalating need for easier
+                   integration with a wider range of enterprise
+                   applications.
+               \endquotation
+           * /
+           \endcode
+
+           will be rendered as
+
+           While the prospect of a significantly broader market is
+           good news for Firstlogic, the notion also posed some
+           challenges. Dave Dobson, director of technology for the La
+           Crosse, Wisconsin-based company, said:
+
+           \quotation
+               As our solutions were being adopted into new
+               environments, we saw an escalating need for easier
+               integration with a wider range of enterprise
+               applications.
+           \endquotation
+
+    \row
+        \o \bold \\footnote \target footnote
+        \o \bold {The \\footnote command and the corresponding
+           \\endfootnote command delimit a footnote.}
+
+           The footnote follows the standard conventions, rendered at the
+           bottom of the page.
+
+           \warning This is preliminary funcionality. The
+           command is not fully implemented.
+
+           For example:
+
+           \code
+           / *!
+               In Qt 4 we have tried to simplify the constructors of
+               QObject/QWidget subclasses. This makes subclassing
+               easier, at the same time as it helps make the Qt
+               library more efficient.
+
+               \footnote
+               Constructors no longer take a "const char *name"
+               parameter. If you want to specify a name for a QObject,
+               you must call QObject::setObjectName() after
+               construction. The object name is now a QString.
+               \endfootnote
+
+               QWidget's WFlags data type has been split in two:
+               Qt::WindowFlags specifies low-level window flags (the
+               type of window and the frame style), whereas
+               Qt::WidgetAttribute specifies various higher-level
+               attributes about the widget (e.g.,
+               WA_StaticContents).
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               In Qt 4 we have tried to simplify the constructors of
+               QObject/QWidget subclasses. This makes subclassing
+               easier, at the same time as it helps make the Qt
+               library more efficient.
+
+               \footnote
+               Constructors no longer take a "const char *name"
+               parameter. If you want to specify a name for a QObject,
+               you must call QObject::setObjectName() after
+               construction. The object name is now a QString.
+               \endfootnote
+
+               QWidget's WFlags data type has been split in two:
+               Qt::WindowFlags specifies low-level window flags (the
+               type of window and the frame style), whereas
+               Qt::WidgetAttribute specifies various higher-level
+               attributes about the widget (e.g.,
+               WA_StaticContents).
+           \endquotation
+
+    \row
+        \o \bold \\tableofcontents \target tableofcontents
+        \o \bold {The \\tableofcontents command generates a
+           table displaying the titles of the current documentation
+           unit's parts, chapters, sections, etc.}
+
+           The command accepts a single optional argument:
+
+           \code
+               \tableofcontents sectionN
+           \endcode
+
+           where \c sectionN is the deepest section to include (by
+           default all sections are included).
+
+           For example, it the documentation unit's structure looks
+           something like this:
+
+           \quotation
+           \raw HTML
+               <a name="Basic Qt">
+               <h1>Basic Qt</h1>
+               </a>
+               <p>This is the first part.</p>
+
+                   <a name="Getting started">
+                   <h2>Getting Started</h2>
+                   </a>
+                   This is the first part's first chapter.</p>
+
+                       <a name="Hello Qt">
+                       <h3>Hello Qt</h3>
+                       </a>
+                       <p>This is the first chapter's first section.</p>
+
+                       <a name="Making Connections">
+                       <h3>Making Connections</h3>
+                       </a>
+                       <p>This is the first chapter's second section.</p>
+
+                       <a name="Using the Reference Documentation">
+                       <h3>Using the Reference Documentation</h3>
+                       </a>
+                       <p>This is the first chapter's third section.</p>
+
+                   <a name="Creating Dialogs">
+                   <h2>Creating Dialogs</h2>
+                   </a>
+                   <p>This is the first part's second chapter.</p>
+
+                       <a name="Subclassing QDialog">
+                       <h3>Subclassing QDialog</h3>
+                       </a>
+                       <p>This is the second chapter's first section.</p>
+
+                       ...
+
+               <a name="Intermediate Qt">
+               <h1>Intermediate Qt</h1>
+               </a>
+               <p>This is the second part.</p>
+
+                   <a name="Layout Management">
+                   <h2>Layout Management</h2>
+                   </a>
+                   <p>This is the second part's first chapter.</p>
+
+                       <a name="Basic Layouts">
+                       <h3>Basic Layouts</h3>
+                       </a>
+                       <p>This is the first chapter's first section.</p>
+
+               ...
+
+           \endraw
+           \endquotation
+
+           Then
+
+           \code
+           / *!
+               Contents:
+
+               \tableofcontents
+
+               ...
+           * /
+           \endcode
+
+           will expand to
+
+           \quotation
+           \raw HTML
+               <p>Contents:</p>
+
+               <ul>
+               <li><a href="#Basic Qt">Basic Qt</a></li>
+                   <ul>
+                   <li><a href="#Getting Started">Getting Started</a></li>
+                       <ul>
+                       <li><a href="#Hello Qt">Hello Qt</a></li>
+                       <li><a href="#Making Connections">
+                           Making Connections</a></li>
+                       <li><a href="#Using the Reference Documentation">
+                           Using the Reference Documentation</a></li>
+                       </ul>
+                   <li><a href="#Creating Dialogs">Creating Dialogs</a></li>
+                       <ul>
+                       <li><a href="#Subclassing QDialog">
+                           Subclassing QDialog</a></li>
+                       </ul>
+                   </ul>
+               <li><a href="#Intermediate Qt">Intermediate Qt</a></li>
+                   <ul>
+                   <li><a href="#Layout Management">Layout Management</a></li>
+                       <ul>
+                       <li><a href="#Basic Layouts">Basic Layouts</a></li>
+                       </ul>
+                   </ul>
+               </ul>
+
+               ...
+           \endraw
+           \endquotation
+
+           Each table entry becomes a link to the corresponding part,
+           chapter or section.
+
+    \row
+        \o \bold \\brief \target brief
+        \o \bold {The \\brief command introduces a one-sentence
+           description of a class, namespace, header file, property
+           or variable.}
+
+           The brief text is used to introduce the documentation of
+           the associated object, and in lists generated using the \l
+           {generatelist}{\\generatelist} command.
+
+           The \\brief command can be used in two significant
+           different ways: \l {brief class}{One for classes,
+           namespaces and header files}, and \l {brief property}{one
+           for properties and variables}.
+
+           \target brief property
+
+           When the \\brief command is used to describe a property or
+           a variable, the brief text must only be a sentence fragment
+           and start with "whether" (for boolean properties and
+           variables) or "the" (for any other property or variable).
+
+           For example the boolean QWidget::isWindow property:
+
+           \code
+           / *!
+               \property QWidget::isActiveWindow
+               \brief whether this widget's window is the active window
+
+               The active window is the window that contains the widget that
+               has keyboard focus.
+
+               When popup windows are visible, this property is true
+               for both the active window \e and for the popup.
+
+               \sa activateWindow(), QApplication::activeWindow()
+           * /
+           \endcode
+
+           and the QWidget::geometry property
+
+           \code
+           / *!
+               \property QWidget::geometry
+               \brief the geometry of the widget relative to its parent and
+               excluding the window frame
+
+               When changing the geometry, the widget, if visible,
+               receives a move event (moveEvent()) and/or a resize
+               event (resizeEvent()) immediately.
+
+               ...
+
+              \sa frameGeometry(), rect(), ...
+           * /
+           \endcode
+
+           The latter will be rendered as
+
+           \quotation
+               \raw HTML
+                   <h3>geometry :
+                   <a href="http://qt.nokia.com/doc/4.0/qrect.html">QRect</a>
+                   </h3>
+               \endraw
+
+               This property holds the geometry of the widget relative
+               to its parent and excluding the window frame.
+
+               ...
+
+               Access functions:
+               \list
+                   \o \bold {const QRect & geometry () const}
+                   \o \bold {void setGeometry ( int x, int y, int w, int h )}
+                   \o \bold {void setGeometry ( const QRect & )}
+               \endlist
+
+               See also \l
+               {QWidget::frameGeometry()}{frameGeometry()}, \l
+               {QWidget::rect()}{rect()}, ...
+           \endquotation
+
+           \target brief class
+
+           When the \\brief command is used to describe a class, the
+           brief text should be a complete sentence and must start
+           like this:
+
+           \code
+           The <classname> class is|provides|contains|specifies...
+           \endcode
+
+           and likewise when the command is used for namespaces or
+           header files.
+
+           \warning The brief statement is used as the first
+           paragraph of the detailed description. Do not repeat the
+           sentence.
+
+           For example:
+
+           \code
+           / *!
+               \class PreviewWindow
+               \brief The PreviewWindow class is a custom widget
+                      displaying the names of its currently set
+                      window flags in a read-only text editor.
+
+               The PreviewWindow class inherits QWidget. The widget
+               displays the names of its window flags set with the
+               setWindowFlags() function. It is also provided with a
+               QPushButton that closes the window.
+
+               ...
+
+               \sa QWidget
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+                   <h1>PreviewWindow Class Reference</h1>
+               \endraw
+
+               The PreviewWindow class is a custom widget displaying
+               the names of its currently set window flags in a
+               read-only text editor. \l {preview window}{More...}
+
+               \raw HTML
+                   <h3>Properties</h3>
+               \endraw
+
+               \list
+                   \o 52 properties inherited from QWidget
+                   \o 1 property inherited from QObject
+               \endlist
+
+               \raw HTML
+                   <h3>Public Functions</h3>
+               \endraw
+
+               \list
+                   \o \l {constructor}{PreviewWindow}(QWidget *parent = 0)
+                   \o void \l {function}{setWindowFlags}(Qt::WindowFlags flags)
+               \endlist
+
+               \list
+                   \o 183 public functions inherited from QWidget
+                   \o 28 public functions inherited from QObject
+               \endlist
+
+               \raw HTML
+                   <h3>Public Slots</h3>
+               \endraw
+
+               \list
+                   \o 17 public slots inherited from QWidget
+                   \o 1 public slot inherited from QObject
+               \endlist
+
+               \raw HTML
+                   <h3>Additional Inherited Members</h3>
+               \endraw
+
+               \list
+                   \o 1 signal inherited from QWidget
+                   \o 1 signal inherited from QObject
+                   \o 4 static public members inherited from QWidget
+                   \o 4 static public members inherited from QObject
+                   \o 39 protected functions inherited from QWidget
+                   \o 7 protected functions inherited from QObject
+               \endlist
+
+               \target preview window
+
+               \raw HTML
+                   <hr />
+                   <h2>Detailed Description</h2>
+               \endraw
+               The PreviewWindow class is a custom widget displaying
+               the names of its currently set window flags in a
+               read-only text editor.
+
+               The PreviewWindow class inherits QWidget. The widget
+               displays the names of its window flags set with the \l
+               {function}{setWindowFlags()} function. It is also
+               provided with a QPushButton that closes the window.
+
+               ...
+
+               See also QWidget.
+
+               \raw HTML
+                   <hr />
+                   <h2>Member Function Documentation</h2>
+               \endraw
+
+               \target constructor
+               \raw HTML
+                   <h3>PreviewWindow(QWidget *parent = 0)</h3>
+               \endraw
+
+               Constructs a preview window widget with \i parent.
+
+               \target function
+               \raw HTML
+                   <h3>setWindowFlags(Qt::WindowFlags flags)</h3>
+               \endraw
+
+               Sets the widgets flags using the
+               QWidget::setWindowFlags() function.
+
+               Then runs through the available window flags,
+               creating a text that contains the names of the flags
+               that matches the flags parameter, displaying
+               the text in the widgets text editor.
+           \endquotation
+
+           Using \\brief with a namespace can for example look like this:
+
+           \code
+           / *!
+               \namespace Qt
+
+               \brief The Qt namespace contains miscellaneous identifiers
+               used throughout the Qt library.
+           * /
+           \endcode
+
+           and finally using \\brief with a header file can look
+           something like this:
+
+           \code
+           / *!
+               \headerfile <QtGlobal>
+               \title Global Qt Declarations
+
+               \brief The <QtGlobal> header file provides basic
+               declarations and is included by all other Qt headers.
+
+               \sa <QtAlgorithms>
+           * /
+           \endcode
+
+           See also \l{property}{\\property}, \l{class}{\\class},
+           \l{namespace}{\\namespace} and  \l{headerfile}{\\headerfile}.
+
+    \row
+        \o \bold \\legalese \target legalese
+        \o \bold {The \\legalese command, and the corresponding \\endlegalese
+           command, delimit a licence agreement.}
+
+           If the \\endlegalese command is omitted, QDoc will still
+           process the \\legalese command but considers the rest of
+           the documentation page as the license agreement.
+
+           Ideally, the license documentation is located where the
+           licensed code is used.
+
+           Later the documentation identified by the \\legalese
+           command can be accumulated into a list using the \l
+           {generatelist}{\\generatelist} command with the \c legalese
+           argument. This is useful to generate an overview of all the
+           licenses associated with the source code.
+
+           For example:
+
+           \code
+           \ * !
+               ...
+
+               On X11, Qt also supports drops via the Motif Drag \&
+               Drop Protocol. The implementation incorporates some
+               code that was originally written by Daniel Dardailler,
+               and adapted for Qt by Matt Koss \<koss@napri.sk\> and
+               Trolltech. Here is the original copyright notice:
+
+               \legalese
+               \code
+
+               Copyright 1996 Daniel Dardailler.
+
+               Permission to use, copy, modify, distribute, and sell
+               this software for any purpose is hereby granted without
+               fee, provided that the above copyright notice appear in
+               all copies and that both that copyright notice and this
+               permission notice appear in supporting documentation,
+               and that the name of Daniel Dardailler not be used in
+               advertising or publicity pertaining to distribution of
+               the software without specific, written prior
+               permission. Daniel Dardailler makes no representations
+               about the suitability of this software for any
+               purpose. It is provided "as is" without express or
+               implied warranty.
+
+               Modifications Copyright 1999 Matt Koss, under the same
+               license as above.
+
+               \ endcode
+               \endlegalese
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               ...
+
+               On X11, Qt also supports drops via the Motif Drag \&
+               Drop Protocol. The implementation incorporates some
+               code that was originally written by Daniel Dardailler,
+               and adapted for Qt by Matt Koss \<koss@napri.sk\> and
+               Trolltech. Here is the original copyright notice:
+
+               \legalese
+               \code
+
+               Copyright 1996 Daniel Dardailler.
+
+               Permission to use, copy, modify, distribute, and sell
+               this software for any purpose is hereby granted without
+               fee, provided that the above copyright notice appear in
+               all copies and that both that copyright notice and this
+               permission notice appear in supporting documentation,
+               and that the name of Daniel Dardailler not be used in
+               advertising or publicity pertaining to distribution of
+               the software without specific, written prior
+               permission. Daniel Dardailler makes no representations
+               about the suitability of this software for any
+               purpose. It is provided "as is" without express or
+               implied warranty.
+
+               Modifications Copyright 1999 Matt Koss, under the same
+               license as above.
+
+               \endcode
+               \endlegalese
+           \endquotation
+
+    \row
+        \o \bold \\warning \target warning
+        \o \bold {The \\warning command renders a "Warning:" prefix to
+           the command's argument.}
+
+           For example:
+
+           \code
+           / *!
+               Qt::HANDLE is a platform-specific handle type
+               for system objects. This is  equivalent to
+               \c{void *} on Windows and Mac OS X, and to
+               \c{unsigned long} on X11.
+
+               \warning Using this type is not portable.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               Qt::HANDLE is a platform-specific handle type
+               for system objects. This is  equivalent to
+               \c{void *} on Windows and Mac OS X, and to
+               \c{unsigned long} on X11.
+
+               \warning Using this type is not portable.
+           \endquotation
+    \endtable
+*/
+
+/*!
+    \page 12-0-qdoc-commands-miscellaneous.html
+    \previouspage Document Contents Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Topical Commands
+
+    \title Miscellaneous Commands
+
+    These commands provide miscellaneous functions
+    connected to the visual appearance of the documentation, and to the
+    process of generating the documentation.
+
+    \section1 Alphabetical List
+
+    \l {12-0-qdoc-commands-miscellaneous.html#else}{\\else},
+    \l {12-0-qdoc-commands-miscellaneous.html#endif}{\\endif},
+    \l {12-0-qdoc-commands-miscellaneous.html#expire}{\\expire},
+    \l {12-0-qdoc-commands-miscellaneous.html#generatelist}{\\generatelist},
+    \l {12-0-qdoc-commands-miscellaneous.html#if}{\\if},
+    \l {12-0-qdoc-commands-miscellaneous.html#include}{\\include},
+    \l {12-0-qdoc-commands-miscellaneous.html#meta}{\\meta},
+    \l {12-0-qdoc-commands-miscellaneous.html#omit}{\\omit},
+    \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\raw},
+    \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\unicode}
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\expire \target expire
+        \o \bold {The \\expire command allows you to define an expiration
+           date for your documentation.}
+
+           When using the \\expire command, QDoc will emit a warning
+           when the current date is larger than the specified
+           date. The command accepts one argument; the argument's
+           format is yyyy-mm-dd. For example:
+
+           \code
+           / *!
+               \page porting.html
+
+               \title Porting to Qt 3.x
+
+               \expire 2004-12-31
+
+               This document describes porting applications from Qt
+               2.x to Qt 3.x.
+
+               The Qt 3.x series is not binary compatible with the
+               2.x series.
+               ...
+           * /
+           \endcode
+
+           If you run QDoc on 4 July 2005, it will emit the warning
+
+           \quotation
+               porting.qdoc:6: Documentation expired 185 days ago
+           \endquotation
+
+    \row
+        \o \bold \\generatelist \target generatelist
+        \o \bold {The \\generatelist command expands to a list of
+           various documentation or links to documentation.}
+
+           For example in the Qt Reference Documentation:
+
+           \code
+           / *!
+               \page classes.html
+               \title All Qt Classes (main index)
+
+               For a shorter list that only includes the most
+               frequently used classes, see \l{Qt's Main Classes}. For
+               a list of Qt 3 support classes, see \l{Qt3Support
+               Classes}.
+
+               \generatelist classes
+           * /
+           \endcode
+
+           is used to generate \l {All Qt Classes (main index)}.
+
+           The command accepts the following arguments:
+
+           \target table example
+
+           \list
+           \o \c annotatedclasses
+
+              The \c annotatedclasses argument provides a table
+              containing the names of all the classes, and a
+              description of each class. Each class name is a link to
+              the class's reference documentation.
+
+              For example:
+
+              \quotation
+                  \raw HTML
+                  <table align="center" cellpadding="2"
+                      cellspacing="1" border="0">
+
+                  <tr valign="top" bgcolor="#d0d0d0">
+                      <td>
+                      <a href="http://qt.nokia.com/doc/4.0/qdial.html">
+                          QDial</a>
+                      </td>
+                      <td>Rounded range control (like a speedometer
+                          or potentiometer)</td>
+                  </tr>
+
+                  <tr valign="top" bgcolor="#d0d0d0">
+                      <td>
+                      <a href="http://qt.nokia.com/doc/4.0/qdialog.html">
+                          QDialog</a>
+                      </td>
+                      <td>The base class of dialog windows</td>
+                  </tr>
+
+                  <tr valign="top" bgcolor="#d0d0d0">
+                      <td>
+                      <a href="http://qt.nokia.com/doc/4.0/qdir.html">
+                          QDir</a>
+                      </td>
+                      <td>Access to directory structures and their
+                          contents</td>
+                  </tr>
+                  </table>
+                  \endraw
+              \endquotation
+
+              A class is identified within the documentation by the
+              the \l {class}{\\class} command, and the descriptions
+              are based on the argument of the \l {brief}{\\brief}
+              commands in the class documentation.
+
+           \target list example
+
+           \o \c classes
+
+              The \c classes argument provides a complete alphabetical
+              list of the classes. Each class name is a link to the
+              class's reference documentation.
+
+              For example:
+
+              \quotation
+                  \raw HTML
+                      <p><table width="100%">
+
+                      <tr>
+                      <td align="right"><b>A&nbsp;</b></td>
+                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractbutton.html">QAbstractButton</a></td>
+
+                      <td align="right"></td>
+                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractextensionmanager.html">QAbstractExtensionManager</a></td>
+
+                      <td align="right"></td>
+                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractitemmodel.html">QAbstractItemModel</a></td>
+                      </tr>
+
+                      <tr>
+                      <td align="right"></td>
+                      <td><a href="http://qt.nokia.com/doc/4.0/qabstracteventdispatcher.html">QAbstractEventDispatcher</a></td>
+
+                      <td align="right"></td>
+                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractformbuilder.html">QAbstractFormBuilder</a></td>
+
+                      <td align="right"></td>
+                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractitemview.html">QAbstractItemView</a></td>
+                      </tr>
+
+                      <tr>
+                      <td align="right"></td>
+                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractextensionfactory.html">QAbstractExtensionFactory</a></td>
+
+                      <td align="right"></td>
+                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractitemdelegate.html">QAbstractItemDelegate</a></td>
+
+                      <td align="right"></td>
+                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractlistmodel.html">QAbstractListModel</a></td>
+                      </tr>
+                      </table></p>
+                  \endraw
+              \endquotation
+
+              A class is identified within the documentation by the
+              the \l {class}{\\class} command.
+
+           \o \c classesbymodule
+
+              This particular argument requests an additional argument,
+              i.e. a specification of the module.
+
+              For example:
+
+              \code
+              / *!
+                  \page qtgui.html
+                  \contentspage Qt Classes by Module
+                  \previouspage QtCore Classes
+                  \nextpage QtNetwork Classes
+
+                  \title QtGui Classes
+
+                  \keyword QtGui
+
+                  \generatelist {classesbymodule QtGui}
+              * /
+              \endcode
+
+              Together, these arguments provide a table containing the
+              classes considered members of the specified module,
+              accompanied with a brief description. Each class name is
+              a link to the class's reference documentation.
+
+              The generated table is rendered similarily to the one
+              generated when using the \l {table example}{\c
+              annotatedclasses} argument.
+
+              For the basic classes in Qt, a class's module is
+              determined by its location, i.e. its directory. However,
+              for extensions, like ActiveQt and Qt Designer, a class
+              is related to a module with the \l
+              {inmodule}{\\inmodule} command.
+
+           \o \c classesbyedition
+
+              This particular argument requests an additional argument,
+              i.e. a specification of the edition.
+
+              For example:
+
+              \code
+              / *!
+                  \page console-edition-classes.html
+                  \title Qt Console Edition Classes
+
+                  \generatelist{classesbyedition Console}
+              * /
+              \endcode
+
+              Together, these arguments provide a table containing the
+              classes considered members of the specified edition,
+              accompanied with a brief description. Each class name is
+              a link to the class's reference documentation.
+
+              The edition a given class can be found in is determined by
+              the module it belongs to.
+
+           \o \c compatclasses
+
+              The \c compatclasses argument provides a complete and
+              alphabetical list of the support classes.  A support
+              class is identified within the documentation by the \l
+              {compat}{\\compat} command. Each class name is a link to
+              the class's reference documentation. The list is
+              rendered similarily to the list generated by the \l
+              {list example}{\c classes} argument.
+
+              \warning The \c classesbymodule argument will at some
+              point replace the this argument.
+
+           \o \c functionindex
+
+              The \c functionindex argument provides a complete
+              alphabetical list of all the documented member
+              functions.
+
+              For example:
+
+              \quotation
+                  \raw HTML
+                      <p><center><font size="+1"><b><a href="#a">A</a>&nbsp;<a href="#b">B</a>&nbsp;<a href="#c">C</a>&nbsp;<a href="#d">D</a>&nbsp;<a href="#e">E</a>&nbsp;<a href="#f">F</a>&nbsp;<a href="#g">G</a>&nbsp;<a href="#h">H</a>&nbsp;<a href="#i">I</a>&nbsp;<a href="#j">J</a>&nbsp;<a href="#k">K</a>&nbsp;<a href="#l">L</a>&nbsp;<a href="#m">M</a>&nbsp;<a href="#n">N</a>&nbsp;<a href="#o">O</a>&nbsp;<a href="#p">P</a>&nbsp;<a href="#q">Q</a>&nbsp;<a href="#r">R</a>&nbsp;<a href="#s">S</a>&nbsp;<a href="#t">T</a>&nbsp;<a href="#u">U</a>&nbsp;<a href="#v">V</a>&nbsp;<a href="#w">W</a>&nbsp;<a href="#x">X</a>&nbsp;<a href="#y">Y</a>&nbsp;<a href="#z">Z</a>&nbsp;</b></font></center></p>
+
+                      <p>DTDHandler: <a href="http://qt.nokia.com/doc/4.0/qxmlreader.html#DTDHandler">QXmlReader</a></p>
+
+                      <p>QAXCLASS: <a href="http://qt.nokia.com/doc/4.0/qaxfactory.html#QAXCLASS">global</a></p>
+
+                      <p>QAXFACTORY_BEGIN: <a href="http://qt.nokia.com/doc/4.0/qaxfactory.html#QAXFACTORY_BEGIN">global</a></p>
+
+                      <p>QAXFACTORY_DEFAULT: <a href="http://qt.nokia.com/doc/4.0/qaxfactory.html#QAXFACTORY_DEFAULT">global</a></p>
+
+                      <p>QAXFACTORY_END: <a href="http://qt.nokia.com/doc/4.0/qaxfactory.html#QAXFACTORY_END">global</a></p>
+
+                  \endraw
+
+                  ...
+              \endquotation
+
+           \o \c legalese
+
+              The \c legalese argument provides a complete list of all
+              the licenses. The licenses are identified within the
+              documentation using the \l {legalese}{\\legalese}
+              command.
+
+              For example:
+
+              \quotation
+                  \raw HTML
+                      <hr />
+                      <p>
+                      Copyright (c) 1989 The Regents of the
+                      University of California. All rights reserved.
+                      </p>
+
+                      <p>
+                      Redistribution and use in source and binary
+                      forms are permitted provided that the above
+                      copyright notice and this paragraph are
+                      duplicated in all such forms and that any
+                      documentation, advertising materials, and other
+                      materials related to such distribution and use
+                      acknowledge that the software was developed by
+                      the University of California, Berkeley...
+                      </p>
+
+                      <ul>
+                      <li>
+                      <a href="http://qt.nokia.com/doc/4.0/qdate.html#weekNumber">QDate::weekNumber()</a>
+                      </li>
+                      </ul>
+
+                      <hr />
+                      <p>
+                      Copyright (c) 1991 by AT&amp;T.
+                      </p>
+
+                      <p>
+                      Permission to use, copy, modify, and distribute
+                      this software for any purpose without fee is
+                      hereby granted, provided that this entire notice
+                      is included in all copies of any software which
+                      is or includes a copy or modification of this
+                      software and in all copies of the supporting
+                      documentation for such software...
+                      </p>
+
+                      <ul>
+                      <li>
+                      <a href="http://qt.nokia.com/doc/4.0/qlocale.html">QLocale</a>
+                      </li>
+                      </ul>
+                      <hr />
+                  \endraw
+                  ...
+              \endquotation
+
+           \o \c mainclasses
+
+              The \c mainclasses argument provides a complete
+              alphabetical list of the main classes. Each class name
+              is a link to the class's reference documentation. A
+              class is related to the group of main classes by using
+              the \l {mainclass}{\\mainclass} command.
+
+              The list is rendered similarily to the list generated by
+              the \l {list example}{\c classes} argument.
+
+           \o \c overviews
+
+              The \c overviews argument provides a complete
+              alphabetical overview of the documentation. Each list
+              entry is a link to the respective documentation page.
+
+              The list includes pages declared using commands like \l
+              {page}{\\page} and \l {group}{\\group}. The list omits
+              examples and classes, and only lists the first page of
+              documentation that contains two or more pages using
+              commands like \l {nextpage}{\\nextpage}.
+
+              For example:
+
+              \quotation
+                  \raw HTML
+                      <ul>
+
+                      <li>
+                      <a href="http://qt.nokia.com/doc/4.0/qtalgorithms.html">
+                      &lt;QtAlgorithms&gt; - Generic Algorithms
+                      </a>
+                      </li>
+
+                      <li>
+                      <a href="http://qt.nokia.com/doc/4.0/qtglobal.html">
+                      &lt;QtGlobal&gt; - Global Qt Declarations
+                      </a>
+                      </li>
+
+                      <li>
+                      <a href="http://qt.nokia.com/doc/4.0/qaxserver-demo-simple.html">
+                      A standard ActiveX and the &quot;simple&quot; ActiveQt widget
+                      </a>
+                      </li>
+
+                      <li>
+                      <a href="http://qt.nokia.com/doc/4.0/aboutqt.html">
+                      About Qt
+                      </a>
+                      </li>
+
+                      <li>
+                      <a href="http://qt.nokia.com/doc/4.0/trolltech.html">
+                      About Trolltech
+                      </a>
+                      </li>
+
+                      <li>
+                      <a href="http://qt.nokia.com/doc/4.0/abstractwidgets.html">
+                      Abstract Widget Classes
+                      </a>
+                      </li>
+
+                      <li>
+                      <a href="http://qt.nokia.com/doc/4.0/accessibility.html">
+                      Accessibility Classes
+                      </a>
+                      </li>
+                      ...
+                      </ul>
+                  \endraw
+              \endquotation
+
+           \o \c related
+
+              The \c related argument is used in combination with the
+              \l {group}{\\group} command to list all the overviews
+              related to the given group. Each list entry is a link to
+              the respective documentation page.
+
+           \o \c relatedinline
+
+              The \c related argument is used in combination with the
+              \l {group}{\\group} command to collect all documentation
+              related to the given group. The various documentation
+              snippets are copied directly into the group page.
+
+           \o \c service
+
+              The \c service argument provides a complete alphabetical
+              list of the services. Each service name is a link to the
+              service's reference documentation.
+
+              A service is identified within the documentation by the
+              \l {service}{\\service} command.
+
+        \endlist
+
+
+    \row
+        \o \bold \\if \target if
+        \o \bold {The \\if command and the corresponding \\endif command
+           enclose parts of a QDoc comment that only will be included if
+           the condition specified by the command's argument is true.}
+
+           The command reads the rest of the line and parses it as an
+           C++ #if statement. For example:
+
+           \code
+           / *!
+               \if defined(opensourceedition)
+
+               \bold{Note:} This edition is for the development of
+               \l{Qt Open Source Edition}{Free and Open Source}
+               software only; see \l{Qt Commercial Editions}.
+
+               \endif
+           * /
+           \endcode
+
+           This QDoc comment will only be rendered if the \c
+           opensourceedition preprocessor symbol is defined, and
+           specified in the \l {definesvariable}{defines} variable in
+           the configuration file to make QDoc process
+           the code within #ifdef and #endif:
+
+           \code
+               defines = opensourceedition
+           \endcode
+
+           You can also define the preprocessor symbol manually on the
+           command line. For more information see the documentation of
+           the \l {definesvariable}{defines} variable.
+
+           See also \l{endif}{\\endif}, \l{else}{\\else}, \l
+           {definesvariable}{defines} and \l falsehoods.
+
+    \row
+        \o \bold \\endif \target endif
+        \o \bold {The \\endif command and the corresponding \\if command
+           enclose parts of a QDoc comment that will be included if
+           the condition specified by the \l {if}{\\if} command's
+           argument is true.}
+
+           For more information, see the documentation of the \l
+           {if}{\\if} command.
+
+           See also \l{if}{\\if}, \l{else}{\\else}, \l
+           {definesvariable}{defines} and \l falsehoods.
+
+    \row
+        \o \bold \\else \target else
+        \o \bold {The \\else command specifies an alternative if the
+           condition in the \l {if}{\\if} command is false.}
+
+           The \\else command can only be used within \l
+           {if}{\\if...\\endif} commands, but is useful when there is
+           only two alternatives. For example:
+
+           \code
+           / *!
+               The Qt 3 support library is provided to keep old
+               source code working.
+
+               In addition to the \c Qt3Support classes, Qt 4 provides
+               compatibility functions when it's possible for an old
+               API to cohabit with the new one.
+
+               \if !defined(QT3_SUPPORT)
+                   \if defined(QT3_SUPPORTWARNINGS)
+                       The compiler emits a warning when a
+                       compatibility function is called. (This works
+                       only with GCC 3.2+ and MSVC 7.)
+                   \else
+                       To use the Qt 3 support library, you need to
+                       have the line QT += qt3support in your .pro
+                       file (qmake automatically define the
+                       QT3_SUPPORT symbol, turning on compatibility
+                       function support).
+
+                       You can also define the symbol manually (e.g.,
+                       if you don't want to link against the \c
+                       Qt3Support library), or you can define \c
+                       QT3_SUPPORT_WARNINGS instead, telling the
+                       compiler to emit a warning when a compatibility
+                       function is called. (This works only with GCC
+                       3.2+ and MSVC 7.)
+                   \endif
+               \endif
+           * /
+           \endcode
+
+           If the \c QT3_SUPPORT is defined, the comment will be rendered
+           as
+
+           \quotation
+               The Qt 3 support library is provided to keep old source
+               code working.
+
+               In addition to the Qt3Support classes, Qt 4 provides
+               compatibility functions when it's possible for an old
+               API to cohabit with the new one.
+           \endquotation
+
+           If \c QT3_SUPPORT isn't defined but \c QT3_SUPPORT_WARNINGS
+           is, the comment will be rendered as
+
+           \quotation
+               The Qt 3 support library is provided to keep old source
+               code working.
+
+               In addition to the Qt3Support classes, Qt 4 provides
+               compatibility functions when it's possible for an old
+               API to cohabit with the new one.
+
+               The compiler emits a warning when a compatibility
+               function is called. (This works only with GCC 3.2+ and
+               MSVC 7.)
+           \endquotation
+
+           If none of the symbols are defined, the comment will be
+           rendered as
+
+           \quotation
+               The Qt 3 support library is provided to keep old
+               source code working.
+
+               In addition to the \c Qt3Support classes, Qt 4 provides
+               compatibility functions when it's possible for an old
+               API to cohabit with the new one.
+
+               To use the Qt 3 support library, you need to have the
+               line QT += qt3support in your .pro file (qmake
+               automatically define the QT3_SUPPORT symbol, turning on
+               compatibility function support).
+
+               You can also define the symbol manually (e.g., if you
+               don't want to link against the \c Qt3Support library),
+               or you can define \c QT3_SUPPORT_WARNINGS instead,
+               telling the compiler to emit a warning when a
+               compatibility function is called. (This works only with
+               GCC 3.2+ and MSVC 7.)
+           \endquotation
+
+           See also \l{if}{\\if}, \l{endif}{\\endif}, \l
+           {definesvariable}{defines} and \l falsehoods.
+
+    \row
+        \o \bold \\include \target include
+        \o \bold {The \\include command  expands to the contents of the
+            file specified by the command's argument.}
+
+            \warning This is preliminary functionality. For more
+            information, see the \l
+            {26-qdoc-commands-compatibility.html#include-versus-input}
+            {compatibility} section.
+
+            The command takes a file name as an argument, and is
+            useful when some piece of the documentation is used
+            repeatedly: Move the repetetive text into a separate file,
+            and use the \\include command whenever you want to insert
+            the separate documentation.
+
+            The contents of such a file should follow QDoc syntax,
+            excluding the enclosing \c{/}\c{*!} ... \c{*}\c{/} marks.
+            To ensure that QDoc won't attempt to read the file as a
+            stand-alone piece of documentation, we recommend that you
+            use the \c .qdocinc extension.
+
+            For example:
+
+            \code
+            / *!
+                \page corefeatures.html
+                \title Core Features
+
+                \include examples/signalandslots.qdocinc
+                \include examples/objectmodel.qdocinc
+                \include examples/layoutmanagement.qdocinc
+            * /
+            \endcode
+
+            will be rendered as
+
+            \quotation
+                \raw HTML
+                <h1>Core Features</h1>
+                \endraw
+
+                \include examples/signalandslots.qdocinc
+                \include examples/objectmodel.qdocinc
+                \include examples/layoutmanagement.qdocinc
+            \endquotation
+
+            Here is the actual \c .qdocinc files: \l
+            signalandslots.qdocinc, \l objectmodel.qdocinc, \l
+            layoutmanagement.qdocinc
+
+    \row
+        \o \bold \\meta \target meta
+        \o \bold {The \\meta command is the QDoc equivalent to the HTML
+           \c meta tag.}
+
+           The command accepts two arguments: The first argument (the
+           following word) is equivalent to the HTML meta tag's \i
+           name variable, and the second argument (the rest of the
+           line) is equivalent to the tag's \i contents variable.
+
+           For example:
+
+           \code
+           / *!
+               \meta author Summerfield
+
+               \section1 Automatic Dialogs
+
+               \abstract
+                   This article shows how to maintain sets of
+                   "attributes" (QVariant values), and how to allow
+                   users to view and edit them using dialogs that are
+                   created dynamically based on the attributes and
+                   their types.
+               \endabstract
+
+               The Attributes class described in this article holds a
+               set of QVariants, and can create a dialog to present
+               the QVariants to the user in an appropriate way.
+
+               ...
+           * /
+           \endcode
+
+           will be included in the generated HTML page as
+
+           \code
+           <head>
+                ...
+                <meta name="author" content="Summerfield" />
+                ...
+           </head>
+           \endcode
+
+    \row
+        \o \bold \\omit \target omit
+        \o \bold {The \\omit command and the correspondning \\endomit
+           command delimit parts of the documentation that
+           you want QDoc to skip.}
+
+           For example:
+
+            \code
+            / *!
+                \table
+                \row
+                    \o Basic Widgets
+                    \o Basic GUI widgets such as buttons, comboboxes
+                       and scrollbars.
+
+                \omit
+                \row
+                    \o Component Model
+                    \o Interfaces and helper classes for the Qt
+                       Component Model.
+                \endomit
+
+                \row
+                    \o Database Classes
+                    \o Database related classes, e.g. for SQL databases.
+                \endtable
+            * /
+            \endcode
+
+            will be rendered as
+
+            \raw HTML
+                <table align="center" cellpadding="2"
+                    cellspacing="1" border="0">
+
+                <tr valign="top" bgcolor="#d0d0d0">
+                    <td>Basic Widgets</td>
+                    <td>Basic GUI widgets such as buttons, comboboxes
+                       and scrollbars.</td>
+                </tr>
+
+                <tr valign="top" bgcolor="#c0c0c0">
+                    <td>Database Classes</td>
+                    <td>Database related classes, e.g. for SQL databases.</td>
+                </tr>
+                </table>
+            \endraw
+
+
+    \row
+        \o \bold \\raw \target raw
+        \o \bold {The \\raw command and the corresponding
+           \\endraw command delimit a block of raw mark-up language code.}
+
+           The command takes an argument specifying the code's format;
+           currently the only supported format is HTML.
+
+           The \\raw command is useful if you want some special HTML
+           effects in your documentation. For example:
+
+           \code
+           / *!
+               Qt has some predefined QColor objects. For example:
+
+               \raw HTML
+               <style type="text/css" id="colorstyles">
+               #blue { background-color: #0000ff; color: #ffffff }
+               #darkBlue { background-color: #000080; color: #ffffff }
+               #cyan { background-color: #00ffff; color: #000000 }
+               </style>
+
+               <p>
+               <tt id="blue">Blue(#0000ff)</tt>,
+               <tt id="darkBlue">dark blue(#000080)</tt> and
+               <tt id="cyan">cyan(#00ffff)</tt>.
+               \endraw
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               Qt has some predefined QColor objects. For example:
+
+               \raw HTML
+               <style type="text/css" id="colorstyles">
+               #blue { background-color: #0000ff; color: #ffffff }
+               #darkBlue { background-color: #000080; color: #ffffff }
+               #cyan { background-color: #00ffff; color: #000000 }
+               </style>
+
+               <p>
+               <tt id="blue">Blue(#0000ff)</tt>,
+               <tt id="darkBlue">dark blue(#000080)</tt> and
+               <tt id="cyan">cyan(#00ffff)</tt>.
+               \endraw
+           \endquotation
+
+    \row
+        \o \bold \\unicode \target unicode
+        \o \bold {The \\unicode command allows you to insert an
+                  arbitrary Unicode character in the document.}
+
+           The command takes an argument specifying the character as
+           an integer. By default, base 10 is assumed, unless a '0x'
+           or '0' prefix is specified (for base 16 and 8,
+           respectively). For example:
+
+           \code
+                O G\unicode{0xEA}nio e as Rosas
+
+                \unicode 0xC0 table en famille avec 15 \unicode 0x20AC par jour
+
+                \unicode 0x3A3 \i{a}\sub{\i{i}}
+           \endcode
+
+           will be rendered as
+
+           \quotation
+                O G\unicode{0xEA}nio e as Rosas
+
+                \unicode 0xC0 table en famille avec 15 \unicode 0x20AC par jour
+
+                \unicode 0x3A3 \i{a}\sub{\i{i}}
+           \endquotation
+
+           The \\raw command follows the same conventions as the \l
+           {i}{\\i} command for \l {argument}{punctuation and use of
+           braces} for the argument.
+    \endtable
+*/
+
+/*!
+    \page 12-1-signalandslots.html
+    \previouspage Miscellaneous Commands
+    \contentspage QDoc Manual - Table of Contents
+
+    \title signalandslots.qdocinc
+
+    \quotefile examples/signalandslots.qdocinc
+*/
+
+/*!
+    \page 12-2-objectmodel.html
+    \previouspage Miscellaneous Commands
+    \contentspage QDoc Manual - Table of Contents
+
+    \title objectmodel.qdocinc
+
+    \quotefile examples/objectmodel.qdocinc
+*/
+
+/*!
+    \page 12-3-layoutmanagement.html
+    \previouspage Miscellaneous Commands
+    \contentspage QDoc Manual - Table of Contents
+
+    \title layoutmanagement.qdocinc
+
+    \quotefile examples/layoutmanagement.qdocinc
+*/
+
+/*!
+    \page 13-qdoc-commands-topical.html
+    \previouspage Miscellaneous Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Contextual Commands
+
+    \title Topical Commands
+
+    The topical commands tell QDoc what is being documented
+    (i.e. existing units like classes, functions and examples), and
+    some of the commands allows you to create extra pages.
+
+    \section1 Alphabetical List
+
+    \l {13-qdoc-commands-topical.html#class}{\\class},
+    \l {13-qdoc-commands-topical.html#enum}{\\enum},
+    \l {13-qdoc-commands-topical.html#example-command}{\\example},
+    \l {13-qdoc-commands-topical.html#externalpage}{\\externalpage},
+    \l {13-qdoc-commands-topical.html#fn}{\\fn},
+    \l {13-qdoc-commands-topical.html#group}{\\group},
+    \l {13-qdoc-commands-topical.html#headerfile}{\\headerfile},
+    \l {13-qdoc-commands-topical.html#macro}{\\macro},
+    \l {13-qdoc-commands-topical.html#module}{\\module},
+    \l {13-qdoc-commands-topical.html#namespace}{\\namespace},
+    \l {13-qdoc-commands-topical.html#page}{\\page},
+    \l {13-qdoc-commands-topical.html#property}{\\property},
+    \l {13-qdoc-commands-topical.html#service}{\\service},
+    \l {13-qdoc-commands-topical.html#typedef}{\\typedef},
+    \l {13-qdoc-commands-topical.html#variable}{\\variable},
+
+    \section1 General Description
+
+    When QDoc is processing a comment, it will try to connect the
+    documentation to the source code. For that reason it will first
+    look for the topical commands. If there is no such command, it
+    will try to tie the documentation to the immediately following
+    code. If there is no topical command, and the documentation cannot
+    be tied to following code, the documentation is simply lost.
+
+    \target topical argument
+
+    The documented unit's name is passed as the unique argument for
+    all the topical commands. The argument's naming convention is the
+    documented unit's complete name. For example:
+
+    \code
+        \enum QComboBox::InsertPolicy
+    \endcode
+
+    Functions is a special case, the argument's naming convention for
+    the \l {fn}{\\fn} command is that of the function's definition
+    outside the class definition. For example:
+
+    \code
+        \fn void PreviewWindow::setWindowFlags()
+    \endcode
+
+    A topical command can appear anywhere in a comment, but must stand
+    alone on its own line. If the argument spans several lines, make
+    sure that each line (except the last one) is ended with a
+    backslash. In addition QDoc counts parentheses, which means that
+    if it encounters a '(' it considers everything until the closing
+    ')' as its argument.
+
+    If a topical command is repeated with different arguments, the
+    same documentation will appear for both the units. For example:
+
+    \code
+    / *!
+        \fn void PreviewWindow::setWindowFlags()
+        \fn void ControllerWindow::setWindowFlags()
+
+        Sets the widgets flags using the QWidget::setWindowFlags()
+        function.
+
+        Then runs through the available window flags, creating a text
+        that contains the names of the flags that matches the flags
+        parameter, displaying the text in the widgets text editor.
+    * /
+    \endcode
+
+    The \c PreviewWindow::setWindowFlags() and \c
+    ControllerWindow::setWindowFlags() functions will get the same
+    documentation.
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\class \target class
+        \o \bold {The \\class command tells QDoc that a class is
+           part of the public API, and lets you enter a detailed
+           description.}
+
+           The command follows \l {topical argument}{the general
+           topical command convention} for the argument, and supports
+           nested classes, for example:
+
+           \code
+           / *!
+               \class QMap::iterator
+
+               \brief The QMap::iterator class provides an STL-style
+               non-const iterator for QMap and QMultiMap.
+
+               QMap features both \l{STL-style iterators} and
+               \l{Java-style iterators}. The STL-style iterators ...
+           * /
+           \endcode
+
+           The generated HTML documentation for the specified class is
+           put in \c <lower-case>classname.html. For example, the
+           documentation for the \c PreviewWindow class is located in
+           \c previewwindow.html.
+
+           \target framework
+
+           In addition to render the detailed description, the \\class
+           comand will generate the documentation framework, i.e. a
+           list of the class's types, properties, functions, signals
+           and slots with empty documentation.
+
+           The command is typically accompanied with a \l
+           {brief}{\\brief} command, a \l {mainclass}{\\mainclass}
+           command, an \l {ingroup}{\\ingroup} command and a \l
+           {sa}{\\sa} command. For example:
+
+           \code
+           / *!
+               \class PreviewWindow
+               \brief The PreviewWindow class is a custom widget
+                      displaying the names of its currently set
+                      window flags in a read-only text editor.
+
+               \mainclass
+               \ingroup miscellaneous
+
+               The PreviewWindow class inherits QWidget. The widget
+               displays the names of its window flags set with the \l
+               {function}{setWindowFlags()} function. It is also
+               provided with a QPushButton that closes the window.
+
+               ...
+
+              \sa QWidget
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+                   <h1>PreviewWindow Class Reference</h1>
+               \endraw
+
+               The PreviewWindow class is a custom widget displaying
+               the names of its currently set window flags in a
+               read-only text editor. \l {preview window}{More...}
+
+               \raw HTML
+                   <h3>Properties</h3>
+               \endraw
+
+               \list
+                   \o 52 properties inherited from QWidget
+                   \o 1 property inherited from QObject
+               \endlist
+
+               \raw HTML
+                   <h3>Public Functions</h3>
+               \endraw
+
+               \list
+                   \o \l {constructor}{PreviewWindow}(QWidget *parent = 0)
+                   \o void \l {function}{setWindowFlags}(Qt::WindowFlags flags)
+               \endlist
+
+               \list
+                   \o 183 public functions inherited from QWidget
+                   \o 28 public functions inherited from QObject
+               \endlist
+
+               \raw HTML
+                   <h3>Public Slots</h3>
+               \endraw
+
+               \list
+                   \o 17 public slots inherited from QWidget
+                   \o 1 public slot inherited from QObject
+               \endlist
+
+               \raw HTML
+                   <h3>Additional Inherited Members</h3>
+               \endraw
+
+               \list
+                   \o 1 signal inherited from QWidget
+                   \o 1 signal inherited from QObject
+                   \o 4 static public members inherited from QWidget
+                   \o 4 static public members inherited from QObject
+                   \o 39 protected functions inherited from QWidget
+                   \o 7 protected functions inherited from QObject
+               \endlist
+
+               \target preview window
+
+               \raw HTML
+                   <hr />
+                   <h2>Detailed Description</h2>
+               \endraw
+
+               The PreviewWindow class is a custom widget displaying
+               the names of its currently set window flags in a
+               read-only text editor.
+
+               The PreviewWindow class inherits QWidget. The widget
+               displays the names of its window flags set with the \l
+               {function}{setWindowFlags()} function. It is also
+               provided with a QPushButton that closes the window.
+
+               ...
+
+               See also QWidget.
+
+               \raw HTML
+                   <hr />
+                   <h2>Member Function Documentation</h2>
+               \endraw
+
+               \target constructor
+               \raw HTML
+                   <h3>PreviewWindow(QWidget *parent = 0)</h3>
+               \endraw
+
+               Constructs a preview window widget with \i parent.
+
+               \target function
+               \raw HTML
+                   <h3>setWindowFlags(Qt::WindowFlags flags)</h3>
+               \endraw
+
+               Sets the widgets flags using the
+               QWidget::setWindowFlags() function.
+
+               Then runs through the available window flags,
+               creating a text that contains the names of the flags
+               that matches the flags parameter, displaying
+               the text in the widgets text editor.
+           \endquotation
+
+    \row
+        \o \bold \\enum \target enum
+        \o \bold {The \\enum command allows you to document a C++ enum.}
+
+           The command follows \l {topical argument}{the general
+           topical command convention} for the argument.
+
+           The enum items are documented using the \l {value}{\\value}
+           command. If an item isn't documented, QDoc will emit a
+           warning. This can be avoided using the \l
+           {omitvalue}{\\omitvalue} command excluding an item from the
+           documentation. The enum documentation will be located in
+           the associated class, header file or namespace
+           documentation.
+
+           For example:
+
+           \code
+               enum Corner {
+                   TopLeftCorner = 0x00000,
+                   TopRightCorner = 0x00001,
+                   BottomLeftCorner = 0x00002,
+                   BottomRightCorner = 0x00003
+           #if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
+                   ,TopLeft = TopLeftCorner,
+                   TopRight = TopRightCorner,
+                   BottomLeft = BottomLeftCorner,
+                   BottomRight = BottomRightCorner
+           #endif
+               };
+           \endcode
+
+           In case of the Qt::Corner enum,
+
+           \code
+           / *!
+               \enum Qt::Corner
+
+               This enum type specifies a corner in a rectangle:
+
+               \value TopLeftCorner
+                      The top-left corner of the rectangle.
+               \value TopRightCorner
+                      The top-right corner of the rectangle.
+               \value BottomLeftCorner
+                      The bottom-left corner of the rectangle.
+               \value BottomRightCorner
+                      The bottom-right corner of the rectangle.
+
+               \omitvalue TopLeft
+               \omitvalue TopRight
+               \omitvalue BottomLeft
+               \omitvalue BottomRight
+           * /
+           \endcode
+
+           this associated QDoc comment will be rendered as
+
+           \quotation
+           \raw HTML
+               <h3 class="fn"><a name="Corner-enum"></a>enum Qt::Corner</h3>
+
+               <p>This enum type specifies a corner in a rectangle:</p>
+
+               <table border="1" cellpadding="2" cellspacing="1" width="100%">
+               <tr>
+               <th width="25%">Constant</th>
+               <th width="15%">Value</th>
+               <th width="60%">Description</th>
+               </tr>
+
+               <tr>
+               <td valign="top"><tt>Qt::TopLeftCorner</tt></td>
+               <td align="center" valign="top"><tt>0x00000</tt></td>
+               <td valign="top">The top-left corner of the rectangle.</td>
+               </tr>
+
+               <tr>
+               <td valign="top"><tt>Qt::TopRightCorner</tt></td>
+               <td align="center" valign="top"><tt>0x00001</tt></td>
+               <td valign="top">The top-right corner of the rectangle.</td>
+               </tr>
+
+               <tr>
+               <td valign="top"><tt>Qt::BottomLeftCorner</tt></td>
+               <td align="center" valign="top"><tt>0x00002</tt></td>
+               <td valign="top">The bottom-left corner of the rectangle.</td>
+               </tr>
+
+               <tr>
+               <td valign="top"><tt>Qt::BottomRightCorner</tt></td>
+               <td align="center" valign="top"><tt>0x00003</tt></td>
+               <td valign="top">The bottom-right corner of the rectangle.</td>
+               </tr>
+
+               </table>
+           \endraw
+           \endquotation
+
+           in qt.html.
+
+           See also \l {value}{\\value} and \l {omitvalue}{\\omitvalue}.
+
+    \row
+        \o \bold \\example \target example-command
+        \o \bold {The \\example command allows you to document an
+           example.}
+
+           The command follows \l {topical argument}{the general
+           topical command convention} for the argument. In particular
+           the command's argument is the example's path relative to
+           the paths listed in the \l exampledirs configuration
+           variable.
+
+           The documentation will be located in \i
+           {path-to-example}.html, and QDoc will add a list of all the
+           example files at the top of this documentation page.
+
+           For example, if \l exampledirs contain \c
+           $QTDIR/examples/widgets/imageviewer, then
+
+           \code
+           / *!
+               \example widgets/imageviewer
+               \title ImageViewer Example
+               \subtitle
+
+               The example shows how to combine QLabel and QScrollArea
+               to display an image.
+
+               ...
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <center><h1>Image Viewer Example</h1></center>
+               \endraw
+
+               Files:
+               \list
+               \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-imageviewer-cpp.html}
+                  {widgets/imageviewer/imageviewer.cpp}
+               \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-imageviewer-h.html}
+                  {widgets/imageviewer/imageviewer.h}
+               \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-main-cpp.html}
+                  {widgets/imageviewer/main.cpp}
+               \endlist
+
+               The example shows how to combine QLabel and QScrollArea
+               to display an image.
+
+               ...
+           \endquotation
+
+           in widgets-imageviewer.html.
+
+    \row
+        \o \bold \\fn \target fn
+        \o \bold {The \\fn command allows you to document a function.}
+
+           The command follows \l {topical argument}{the general
+           topical command convention} for the argument. In particular
+           it is important that the return type of the function,
+           whether it is \c const or not and the complete set of
+           arguments with type are included in the argument.  If the
+           referenced function doesn't exist, QDoc will emit a
+           warning.
+
+           Also, the \\fn command is QDoc's default command, i.e. when
+           no topical command can be found within a QDoc comment, QDoc
+           tries to tie the documentation to the following code as if
+           it was function documentation.
+
+           This means that the command normally isn't necessary since
+           the recommended style is to write the function
+           documentation directly before the function implementation
+           in the \c .cpp file. In fact, it should only be used for
+           inline functions implemented in the \c .h file.
+
+           For example:
+
+           \code
+           / *!
+               \fn bool QToolBar::isAreaAllowed(Qt::ToolBarArea area) const
+
+               Returns true if this toolbar is dockable in the given
+               \a area; otherwise returns false.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h3>bool QToolBar::isAreaAllowed(Qt::ToolBarArea area) const
+               </h3>
+               \endraw
+
+               Returns true if this toolbar is dockable in the given
+               \a area; otherwise returns false.
+           \endquotation
+
+           See also \l {overload}{\\overload}.
+
+    \row
+        \o \bold \\group \target group
+        \o \bold {The \\group command creates a separate page that
+           lists the classes belonging to the group specified by the
+           command's argument.}
+
+           The command follows \l {topical argument}{the general
+           topical command convention} for the argument. The \\group
+           command is typically followed by a \l {title}{\\title}
+           command and a short introduction to the group.  The
+           generated HTML documentation for the specified group is put
+           in <lower-case>\i{group}.html.
+
+           A class can be related to a group by using the \l
+           {ingroup}{\\ingroup} command. In addition, overviews can be
+           related to a group using the same command, but these must
+           be listed explicitly using the \l
+           {generatelist}{\\generatelist} command (see example below).
+
+           Each class is listed with a link to the class reference
+           page and a brief description based on the classes' \l
+           {brief}{\\brief} texts. For example:
+
+           \code
+           / *!
+               \group io
+
+               \title Input/Output and Networking
+
+               These classes are used to handle input and output to
+               and from external devices, processes, files etc. as
+               well as manipulating files and directories.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+                \raw HTML
+
+                <h1>Input/Output and Networking</h1>
+
+                <p>These classes are used to handle input and output
+                to and from external devices, processes, files etc. as
+                well as manipulating files and directories.</p>
+
+                <p>
+                <table width="100%">
+                    <tr valign="top" bgcolor="#e0e0e0">
+                    <td><b>
+                    <a href="http://qt.nokia.com/doc/4.0/qabstractsocket.html">QAbstractSocket</a>
+                    </b></td>
+                    <td>
+                    The base functionality common to all socket types
+                    </td></tr>
+
+                    <tr valign="top" bgcolor="#e0e0e0">
+                    <td><b>
+                    <a href="http://qt.nokia.com/doc/4.0/qbuffer.html">QBuffer</a>
+                    </b></td>
+                    <td>
+                    QIODevice interface for a QByteArray
+                    </td></tr>
+
+                    <tr valign="top" bgcolor="#e0e0e0">
+                    <td><b>
+                    <a href="http://qt.nokia.com/doc/4.0/qclipboard.html">QClipboard</a>
+                    </b></td>
+                    <td>
+                    Access to the window system clipboard
+                    </td></tr>
+                </table>
+                \endraw
+           \endquotation
+
+           in io.html.
+
+           Note that overviews related to the given group, must be
+           listed explicitly using the \l
+           {generatelist}{\\generatelist} command with the \c related
+           argument. For example:
+
+           \code
+           / *!
+               \group architecture
+
+               \title Architecture
+
+               These documents describe aspects of Qt's architecture
+               and design, including overviews of core Qt features and
+               technologies.
+
+               \generatelist{related}
+           * /
+           \endcode
+
+           See also \l {ingroup}{\\ingroup} and \l
+           {generatelist}{\\generatelist}.
+
+    \row
+        \o \bold \\headerfile \target headerfile
+        \o \bold {The \\headerfile command allows you to document
+           global functions, types and macros declared in a header file.}
+
+           The command follows \l {topical argument}{the general
+           topical command convention} for the argument, and the
+           generated HTML documentation for the specified header file
+           is put in <lower-case>\i{headerfilename}.html.
+
+           A function, type or macro can be associated with a
+           headerfile using the \l {relates}{\\relates} command.
+
+           If the referenced header file doesn't exist, the
+           \\headerfile command will still create a documentation page
+           for a header file with the referenced file's name.
+
+           For example:
+
+           \code
+           / *!
+               \headerfile <QtAlgorithms>
+
+               \title Generic Algorithms
+
+               \brief The <QtAlgorithms> header file provides
+                generic template-based algorithms.
+
+               Qt provides a number of global template functions in \c
+               <QtAlgorithms> that work on containers and perform
+               well-know algorithms.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <center><h1>&lt;QtAlgorithms&gt; -
+                           Generic Algorithms</h1></center>
+               <p>The <QtAlgorithms> header file provides generic
+               template-based algorithms.
+               <a href="13-qdoc-commands-topical.html#header">More...</a>
+               </p>
+
+               <h3>Functions</h3>
+               <ul>
+               <li>RandomAccessIterator
+               <a href="http://qt.nokia.com/doc/4.0/qlineedit.html#EchoMode-enum">qBinaryFind</a></b>
+               (RandomAccessIterator begin, RandomAccessIterator end,
+               const T & value)</li>
+               <li>...</li></ul>
+               <hr />
+               \endraw
+
+               \target header
+
+               \raw HTML
+               <h2>Detailed Description</h2>
+               <p>The <QtAlgorithms> header file provides generic
+               template-based algorithms. </p>
+               \endraw
+
+               Qt provides a number of global template functions in \c
+               <QtAlgorithms> that work on containers and perform
+               well-know algorithms.
+
+               ...
+           \endquotation
+
+           in qtalgorithms.html.
+
+    \row
+        \o \bold \\macro \target macro
+        \o \bold {The \\macro command allows you to document a C++ macro.}
+
+           The command follows \l {topical argument}{the general
+           topical command convention} for the argument.
+
+           QDoc recognizes three different macro syntax: function-like
+           macros like Q_ASSERT(), declaration-style macros like
+           Q_PROPERTY() and macros without parentheses like Q_OBJECT.
+
+           The \\macro command must be followed by a \l
+           {relates}{\\relates} command which attaches the
+           documentation to that of a related class, header file. or
+           namespace. Otherwise the documentation will be lost.
+
+           For example:
+
+           \code
+           / *!
+               \macro void Q_ASSERT(bool test)
+               \relates <QtGlobal>
+
+               Prints a warning message containing the source code
+               file name and line number if \a test is false.
+
+               ...
+
+               \sa Q_ASSERT_X(), qFatal(), {Debugging Techniques}
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h3>void Q_ASSERT ( bool <i>test</i> )</h3>
+               \endraw
+
+               Prints a warning message containing the source code
+               file name and line number if \a test is false.
+
+               ...
+
+               See also Q_ASSERT_X(), qFatal() and \l {Debugging
+               Techniques}.
+           \endquotation
+
+           in qtglobal.html. And
+
+           \code
+           / *!
+               \macro Q_PROPERTY(...)
+               \relates QObject
+
+               This macro declares a QObject property. The syntax is:
+
+               ...
+
+               \sa {Qt's Property System}
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h3>Q_PROPERTY ( ... )</h3>
+               \endraw
+
+               This macro declares a QObject property. The syntax is:
+
+               ...
+
+               See also \l {Qt's Property System}.
+           \endquotation
+
+           in qobject.html. And
+
+           \code
+           / *!
+               \macro Q_OBJECT
+               \relates QObject
+
+               The Q_OBJECT macro must appear in the private section
+               of a class definition that declares its own signals and
+               slots or that uses other services provided by Qt's
+               meta-object system.
+
+               ...
+
+               \sa {Meta-Object System}, {Signals and Slots}, {Qt's
+               Property System}
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h3>Q_OBJECT</h3>
+               \endraw
+
+               The Q_OBJECT macro must appear in the private section
+               of a class definition that declares its own signals and
+               slots or that uses other services provided by Qt's
+               meta-object system.
+
+               ...
+
+               See also \l {Meta-Object System}, \l {Signals and
+               Slots} and \l {Qt's Property System}.
+           \endquotation
+
+           in qobject.html.
+
+    \row
+        \o \bold \\module \target module
+        \o \bold {The \\module creates a separate page that lists the
+           classes belonging to the module specified by the command's
+           argument.}
+
+           The command follows \l {topical argument}{the general
+           topical command convention} for the argument.
+
+           A class can be related to a module using the \l
+           {inmodule}{\\inmodule} command.
+
+           The \\module command is typically followed by the \l
+           {title}{\\title} and \l {brief}{\\brief} commands. Each
+           class is listed with a link to the class reference page and
+           a brief description based on the classes' \l
+           {brief}{\\brief} texts.
+
+           For example:
+
+           \code
+           / *!
+               \module QtNetwork
+
+               \title QtNetwork Module
+
+               \brief The QtNetwork module offers classes that allow
+               you to write TCP/IP clients and servers.
+
+               The network module provides classes to make network
+               programming easier and portable. It offers both
+               high-level classes such as QHttp and QFtp that
+               implement specific application-level protocols, and
+               lower-level classes such as QTcpSocket, QTcpServer, and
+               QUdpSocket.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h1><center>QtNetwork Module</center></h1>
+               \endraw
+
+               The QtNetwork module offers classes that allow you to
+               write TCP/IP clients and servers.\l {module
+               details}{More...}
+
+               \raw HTML
+               <p>
+               <table width="100%">
+                   <tr valign="top" bgcolor="#d0d0d0">
+                   <td><b>
+                   <a href="http://qt.nokia.com/doc/4.0/qabstractsocket.html">QAbstractSocket</a>
+                   </b></td>
+                   <td>
+                   The base functionality common to all socket types
+                   </td></tr>
+
+                   <tr valign="top" bgcolor="#d0d0d0">
+                   <td><b>
+                   <a href="http://qt.nokia.com/doc/4.0/qftp.html">QFtp</a>
+                   </b></td>
+                   <td>
+                   Implementation of the FTP protocol
+                   </td></tr>
+
+                   <tr valign="top" bgcolor="#d0d0d0">
+                   <td>...</td>
+                   <td>...</td>
+                   </tr>
+               </table>
+
+               <p><hr /></p>
+               \endraw
+
+               \target module details
+
+               \raw HTML
+               <h2>Detailed Description</h2>
+
+               <p>
+               The QtNetwork module offers classes that allow you to
+               write TCP/IP clients and servers.
+               </p>
+
+               <p>
+               The network module provides classes to make network
+               programming easier and portable. It offers both
+               high-level classes such as QHttp and QFtp that
+               implement specific application-level protocols, and
+               lower-level classes such as QTcpSocket, QTcpServer, and
+               QUdpSocket.
+               </p>
+               \endraw
+
+               ...
+
+           \endquotation
+
+           in qtnetwork.html.
+
+           See also \l {inmodule}{\\inmodule}
+
+    \row
+        \o \bold \\namespace \target namespace
+        \o \bold {The \\namespace command allows you to document a C++
+           namespace.}
+
+           The command follows \l {topical argument}{the general
+           topical command convention} for the argument.
+
+           QDoc will generate the same additional links and
+           documentation for all the members of the namespace as it
+           does for \l {framework}{classes}. The documentation for
+           the specified namespace is put in <lower-case>\i
+           {namespace}.html.
+
+           For example:
+
+           \code
+           / *!
+               \namespace Qt
+
+               \brief The Qt namespace contains miscellaneous
+               identifiers used throughout the Qt library.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <center><h1>Qt Namespace Reference</h1></center>
+               <p>The Qt namespace contains miscellaneous
+               identifiers used throughout the Qt library.
+               <a href="13-qdoc-commands-topical.html#name">More...</a>
+               </p>
+
+               <pre>#include &lt;Qt&gt;</pre>
+               <ul>
+               <li>
+               <a href="http://qt.nokia.com/doc/4.0/qt-qt3.html">
+                   Qt 3 support members</a></li>
+               </ul>
+
+
+               <h3>Types</h3>
+               <ul>
+               <li>flags
+               <a href="http://qt.nokia.com/doc/4.0/qt.html#AlignmentFlag-enum">Alignment</a></b></li>
+               <li>...</li></ul>
+               <hr />
+               \endraw
+
+               \target name
+
+               \raw HTML
+               <h2>Detailed Description</h2>
+               <p>The Qt namespace contains miscellaneous identifiers
+               used throughout the Qt library.</p>
+               \endraw
+
+               ...
+           \endquotation
+
+           in qt.html.
+
+    \row
+        \o \bold \\page \target page
+        \o \bold {The \\page command allows you to create a stand-alone
+           documentation page.}
+
+           The command follows \l {topical argument}{the general
+           topical command convention} for the argument.
+
+           The page's title can be set using the \l {title}{\\title}
+           command. For example:
+
+           \code
+           / *!
+               \page aboutqt.html
+
+               \title About Qt
+
+               Qt by Trolltech is a C++ toolkit for cross-platform GUI
+               application development. Qt provides single-source
+               portability across Microsoft Windows, Mac OS X, Linux,
+               and all major commercial Unix variants. (A version of
+               Qt 4 for embedded Linux will be available in
+               August/September 2005.)
+
+               Qt provides application developers with all the
+               functionality needed to build applications with
+               state-of-the-art graphical user interfaces. Qt is fully
+               object-oriented, easily extensible, and allows true
+               component programming.
+
+               ...
+            * /
+            \endcode
+
+           will be rendered in its own HTML file: \l{About Qt}.
+
+    \row
+        \o \bold {\\externalpage} \target externalpage
+        \o \bold {The \\externalpage command gives a title to
+            an external URL.}
+
+           The command follows \l {topical argument}{the general
+           topical command convention} for the argument.
+
+           For example:
+
+           \code
+           / *!
+               \externalpage http://www.trolltech.com/products/embedded/index.html
+               \title Qtopia Core
+           * /
+           \endcode
+
+           The QDoc comment above allows you to link to the Qtopia
+           Core webpage by simply linking to the given title. For
+           example:
+
+           \code
+           / *!
+               The broad scope of the \l {Qtopia Core} API enables it to
+               be used across a wide variety of development projects.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               The broad scope of the \l
+               {http://www.trolltech.com/products/embedded/index.html}{Qtopia
+               Core} API enables it to be used across a wide variety
+               of development projects.
+           \endquotation
+
+           To achieve the same result without using the
+           \\externalpage command, you would have to hard code the
+           adress into your documentation:
+
+           \code
+           / *!
+               The broad scope of the \l
+               {http://www.trolltech.com/products/embedded/index.html}{Qtopia
+               Core} API enables it to be used across a wide variety
+               of development projects.
+           * /
+           \endcode
+
+           The \\externalpage command makes it easier to maintain the
+           documentation. If the adress changes, you only need to change the
+           argument of the \\externalpage command.
+
+    \row
+        \o \bold \\property \target property
+        \o \bold {The \\property command allows you to document a Qt
+           property.}
+
+           The command follows \l {topical argument}{the general
+           topical command convention} for the argument.
+
+           A property is defined using the Q_PROPERTY() macro. The
+           macro takes as arguments the property's name and its set,
+           reset and get functions. For example:
+
+           \code
+           Q_PROPERTY(QString state READ state WRITE setState)
+           \endcode
+
+           The set, reset and get functions don't need to be
+           documented, documenting the property is sufficient. QDoc
+           will generate a list of the access function that will
+           appear in the property documentation which in turn will be
+           located in the documentation of the class that defines the
+           property.
+
+           The \\property command is typically accompanied with a \l
+           {brief}{\\brief} command.  In the case of a property, the
+           \l {brief}{\\brief} command's argument is a sentence
+           fragment that will be included in a one-sentence
+           description of the property generated by QDoc. The command
+           follows the same rules for the \l {brief
+           property}{description} as the \l {variable}{\\variable}
+           command.
+
+           For example:
+
+           \code
+           / *!
+               \property QPushButton::flat
+               \brief whether the border is disabled
+
+               This property's default is false.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h3>flat : bool</h3>
+               \endraw
+
+               This property holds whether the border is disabled.
+
+               This property's default is false.
+
+               Access functions:
+
+               \list
+               \o \bold { bool isFlat () const}
+               \o \bold { void setFlat ( bool )}
+               \endlist
+
+           \endquotation
+
+           in qpushbutton.html. And
+
+           \code
+           / *!
+               \property QWidget::width
+               \brief the width of the widget excluding any window frame
+
+               See the \l {Window Geometry} documentation for an
+               overview of window geometry.
+
+               \sa geometry, height, size
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h3>width : const int</h3>
+               \endraw
+
+               This property holds the width of the widget excluding
+               any window frame.
+
+               See the \l {Window Geometry} documentation for an
+               overview of window geometry.
+
+               Access functions:
+
+               \list
+               \o \bold { int width () const}
+               \endlist
+
+               See also \l{QWidget::geometry}{geometry},
+               \l{QWidget::height}{height}, and \l{QWidget::size}{size}.
+           \endquotation
+
+           in qwidget.html.
+
+    \row
+        \o \bold \\service \target service
+
+        \o \bold {The \\service command tells QDoc that a class is a
+            service class and specifies its alias, i.e. the associated
+            service's name.}
+
+            The command takes two arguments, the service class's name
+            and the associated alias. For example:
+
+            \code
+                / *!
+                    \service TimeService Time
+                    ...
+                * /
+                class TimeService : public QCopObjectService
+                {
+                    ...
+                }
+            \endcode
+
+            See also \l {class}{\\class} and \l
+            {generatelist}{\\generatelist}.
+
+    \row
+        \o \bold \\typedef \target typedef
+        \o \bold {The \\typedef command allows you to document a C++ type
+           definition.}
+
+           The command follows \l {topical argument}{the general
+           topical command convention} for the argument.
+
+           The documentation will be located in the associated class,
+           header file or namespace documentation. When documenting a
+           global type definition, the \\typedef command must be
+           accompanied with a \l {relates}{\\relates} command. For
+           example:
+
+           \code
+           / *!
+               \typedef QObjectList
+               \relates QObject
+
+               Synonym for QList<QObject>.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h3>typedef QObjectList</h3>
+               \endraw
+
+               Synonym for QList<QObject>.
+           \endquotation
+
+           in qobject.html. Another, although more rare, example is
+
+           \code
+           / *!
+               \typedef QMsgHandler
+               \relates QtGlobal
+
+               This is a typedef for a pointer to a function with the
+               following signature:
+
+               \code
+                   void myMsgHandler(QtMsgType, const char *);
+               \ endcode
+
+               \sa QtMsgType, qInstallMsgHandler()
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h3>typedef QtMsgHandler</h3>
+               \endraw
+
+               This is a typedef for a pointer to a function with the
+               following signature:
+
+               \raw HTML
+               <tt>
+               <pre>    void myMsgHandler(QtMsgType, const char *);</pre>
+               </tt>
+               \endraw
+
+               See also QtMsgType and qInstallMsgHandler().
+
+           \endquotation
+
+           in qtglobal.html. Other type definitions are located in the
+           documentation of the class that defines it, for example:
+
+           \code
+           / *!
+               \typedef QLinkedList::Iterator
+
+               Qt-style synonym for QList::iterator.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h3>typedef QLinkedList::Iterator</h3>
+               \endraw
+
+               Qt-style synonym for QList::iterator.
+           \endquotation
+
+           in qlinkedlist.html.
+
+    \row
+        \o \bold \\variable \target variable
+        \o \bold {The \\variable command allows you to document a
+           member variable or a constant.}
+
+           The command follows \l {topical argument}{the general
+           topical command convention} for the argument.
+
+           The \\variable command is typically followed by a \l
+           {brief}{\\brief} command; QDoc will generate the
+           documentation for the variable based on the brief
+           description. The command follows the same rules for the \l
+           {brief property}{description} as the \l
+           {property}{\\property} command.
+
+           The documentation will be located in the in the associated
+           class, header file or namespace documentation.
+
+           In case of a member variable:
+
+           \code
+           / *!
+               \variable QStyleOption::palette
+               \brief the palette that should be used when painting
+                      the control
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h3>
+               <a href="http://qt.nokia.com/doc/4.0/qpalette.html">
+               QPalette
+               </a>
+               QStyleOption::palette
+               </h3>
+               \endraw
+
+               This variable holds the palette that should be used
+               when painting the control.
+           \endquotation
+
+           in qstyleoption.html.
+
+           But you can also use the \\variable command to document
+           constants like for example the \c Type and \c UserType
+           constants in the QTreeWidgetItem class:
+
+           \code
+           enum { Type = 0, UserType = 1000 };
+           \endcode
+
+           Then
+
+           \code
+           / *!
+               \variable QTreeWidgetItem::Type
+
+               The default type for tree widget items.
+
+               \sa UserType, type()
+           * /
+           \endcode
+
+           and
+
+           \code
+           / *!
+               \variable QTreeWidgetItem::UserType
+
+               The minimum value for custom types. Values below
+               UserType are reserved by Qt.
+
+               \sa Type, type()
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h3>
+               const int QTreeWidgetItem::Type
+               </h3>
+               \endraw
+
+               The default type for tree widget items.
+
+               See also \l {QTreeWidgetItem::UserType}{UserType} and
+               \l {QTreeWidgetItem::type()}{type()}.
+
+               \raw HTML
+               <h3>
+               const int QTreeWidgetItem::UserType
+               </h3>
+               \endraw
+
+               The minimum value for custom types. Values below
+               UserType are reserved by Qt.
+
+               See also \l {QTreeWidgetItem::Type}{Type} and
+               \l{QTreeWidgetItem::type()}{type()}.
+
+           \endquotation
+
+           in qtreewidget.html.
+    \endtable
+*/
+
+/*!
+    \page 14-qdoc-commands-contextualcommands.html
+    \previouspage Topical Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Navigation Commands
+
+    \title Contextual Commands
+
+    The contextual commands provide QDoc with information, that it
+    wouldn't figure out otherwise, about the documented object. For
+    example whether a class is thread-safe or not.
+
+    These commands can appear anywhere within a QDoc comment.
+
+    \section1 Alphabetical List
+
+    \l {16-qdoc-commands-status.html#compat}{\\compat},
+    \l {15-qdoc-commands-navigation.html#contentspage}{\\contentspage},
+    \l {15-qdoc-commands-navigation.html#indexpage}{\\indexpage},
+    \l {19-qdoc-commands-grouping.html#ingroup}{\\ingroup},
+    \l {19-qdoc-commands-grouping.html#inmodule}{\\inmodule},
+    \l {16-qdoc-commands-status.html#internal}{\\internal},
+    \l {19-qdoc-commands-grouping.html#mainclass}{\\mainclass},
+    \l {15-qdoc-commands-navigation.html#nextpage}{\\nextpage},
+    \l {17-qdoc-commands-thread.html#nonreentrant}{\\nonreentrant},
+    \l {16-qdoc-commands-status.html#obsolete}{\\obsolete},
+    \l {18-qdoc-commands-relating.html#overload}{\\overload},
+    \l {16-qdoc-commands-status.html#preliminary}{\\preliminary},
+    \l {15-qdoc-commands-navigation.html#previouspage}{\\previouspage},
+    \l {17-qdoc-commands-thread.html#reentrant}{\\reentrant},
+    \l {18-qdoc-commands-relating.html#reimp}{\\reimp},
+    \l {18-qdoc-commands-relating.html#relates}{\\relates},
+    \l {15-qdoc-commands-navigation.html#startpage}{\\startpage},
+    \l {17-qdoc-commands-thread.html#threadsafe}{\\threadsafe},
+    \l {20-qdoc-commands-title.html#title}{\\title}
+
+    \section1 Categories
+    \list
+    \o \l {Navigation Commands}
+    \o \l {Status Commands}
+    \o \l {Thread Support Commands}
+    \o \l {Relating Commands}
+    \o \l {Grouping Commands}
+    \o \l {Title Commands}
+    \endlist
+*/
+
+/*!
+    \page 15-qdoc-commands-navigation.html
+    \previouspage Contextual Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Status Commands
+
+    \title Navigation Commands
+
+    The navigation commands allow you to link the pages of a multipage
+    document together. They provide the components of a navigation bar
+    at the top and bottom of the document. They also provide browser
+    and search engine support.
+
+    \section1 Alphabetical List
+
+    \l {15-qdoc-commands-navigation.html#contentspage}{\\contentspage},
+    \l {15-qdoc-commands-navigation.html#indexpage}{\\indexpage},
+    \l {15-qdoc-commands-navigation.html#nextpage}{\\nextpage},
+    \l {15-qdoc-commands-navigation.html#previouspage}{\\previouspage},
+    \l {15-qdoc-commands-navigation.html#startpage}{\\startpage}
+
+    \section1 General Description
+
+    The QDoc comments below shows a typical example using the
+    navigation commands.
+
+    \code
+    / *!
+        \page basicqt.html
+        \contentspage {Basic Qt}{Contents}
+        \nextpage Getting Started
+
+        \indexpage Index
+        \startpage Basic Qt
+
+        \title Basic Qt
+
+        The Qt toolkit is a C++ class library and a set of tools for
+        building multiplatform GUI programs using a "write once,
+        compile anywhere approach".
+
+        Table of contents:
+
+        \list
+        \o \l {Getting Started}
+        \o \l {Creating Dialogs}
+        \o \l {Creating Main Windows}
+        \endlist
+    * /
+
+    / *!
+        \page gettingstarted.html
+        \previouspage Basic Qt
+        \contentspage {Basic Qt}{Contents}
+        \nextpage Creating Dialogs
+
+        \indexpage Index
+        \startpage Basic Qt
+
+        \title Getting Started
+
+        This chapter shows how to combine basic C++ with the
+        functionality provided by Qt to create a few small graphical
+        interface (GUI) applications.
+    * /
+
+    / *!
+        \page creatingdialogs.html
+        \previouspage Getting Started
+        \contentspage {Basic Qt}{Contents}
+
+        \indexpage Index
+        \startpage Basic Qt
+
+        \title Creating Dialogs
+
+        This chapter will teach you how to create dialog boxes using Qt.
+    * /
+
+    / *!
+        \page index.html
+
+        \indexpage Index
+        \startpage Basic Qt
+
+        \title Index
+
+        \list
+            \o \l {Basic Qt}
+            \o \l {Creating Dialogs}
+            \o \l {Getting Started}
+        \endlist
+    * /
+    \endcode
+
+    The second page of this multipage document, "Getting Started",
+    will be rendered as
+
+    \quotation
+    \raw HTML
+        <table border="0" cellpadding="0" cellspacing="5" width="100%">
+
+        <tr>
+        <p>
+        [Previous: <a href="15-qdoc-commands-navigation.html#deadlink">
+        Basic Qt</a>]
+        [<a href="15-qdoc-commands-navigation.html#deadlink">Contents</a>]
+        [Next: <a href="15-qdoc-commands-navigation.html#deadlink">
+        Creating Dialogs</a>]
+        </p>
+
+        <h1 align="center">Getting Started<br /></h1>
+
+        <p>
+        This chapter shows how to combine basic C++ with the
+        functionality provided by Qt to create a few small graphical
+        interface (GUI) applications.
+        </p>
+
+        <p>
+        [Previous: <a href="15-qdoc-commands-navigation.html#deadlink">
+        Basic Qt</a>]
+        [<a href="15-qdoc-commands-navigation.html#deadlink">Contents</a>]
+        [Next: <a href="15-qdoc-commands-navigation.html#deadlink">
+        Creating Dialogs</a>]
+        </p>
+
+        </table>
+    \endraw
+    \endquotation
+
+    in creatingdialogs.html.
+
+    In addition, the \l {indexpage}{\\indexpage} and \l
+    {startpage}{\\startpage} commands specifies links to the page's
+    index page and start page. These links are used by browsers and
+    search engines.
+
+    The index page is typically an alphabetical list of the document's
+    titles and topics, while the start page is the page considered by
+    the author to be the starting point of a multipage document.
+
+    The links are included in the generated HTML source code but has
+    no visual effect on the documentation:
+
+    \code
+    <head>
+        ...
+        <link rel="index" href="index.html" />
+        <link rel="start" href="basicqt.html" />
+        ...
+    </head>
+    \endcode
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\previouspage \target previouspage
+        \o \bold {The \\previouspage command links the current page
+           to the previous one in an ordered series of documents}.
+
+           The command has two arguments, each enclosed by curly
+           braces: The first is the link target, i.e. the title of the
+           previous page, the second is the link text. If the page's
+           title is equivalent to the link text, the second argument
+           can be omitted.
+
+           The command must stand alone on its own line.
+
+           In the end, the link is rendered at the top and bottom of
+           the current page. For an example, see the \l {General
+           Description} section.
+
+    \row
+        \o \bold \\nextpage \target nextpage
+        \o \bold {The \\nextpage command links the current
+           page to the next page in an ordered series of documents}.
+
+           The command follows the same syntax and argument convention
+           as the \l {previouspage}{\\previouspage} command.
+
+           For an example, see the \l {General Description} section.
+
+    \row
+        \o \bold \\startpage \target startpage
+        \o \bold {The \\startpage command specifies the first document
+           in a collection of documents.}
+
+           The command must stand alone on its own line, and its
+           unique argument is the title of the first document.
+
+           QDoc will generate a link to the specified document which
+           is included in the HTML file but has no visual effect on
+           the documentation. The generated link type tells browsers
+           and search engines which document is considered by the
+           author to be the starting point of the collection.
+
+           For an example, see the \l {General Description} section.
+
+    \row
+        \o \bold \\contentspage \target contentspage
+        \o \bold {The \\contentspage command links the current
+           page to a contents page}.
+
+           The command follows the same syntax and argument convention
+           as the \l {previouspage}{\\previouspage} command.
+
+           For an example, see the \l {General Description} section.
+
+    \row
+        \o \bold \\indexpage \target indexpage
+        \o \bold {The \\indexpage command specifies a document providing
+           an index for the current document}.
+
+           The command must stand alone on its own line, and its
+           unique argument is the title of the index document.
+
+           QDoc will generate a link to the specified document which
+           is included in the HTML file but has no visual effect on
+           the documentation. The generated link type tells browsers
+           and search engines which document is considered by the
+           author to be the index page for the current document.
+
+           For an example, see the \l {General Description} section.
+
+    \endtable
+*/
+
+/*!
+    \page 16-qdoc-commands-status.html
+    \previouspage Navigation Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Thread Support Commands
+
+    \title Status Commands
+
+    The usage commands can indicate whether a documented object is
+    under development, becoming obsolete, provided for compatibility
+    reasons or simply not part of the public interface. They can
+    describe the history of minor versions. And they can also describe
+    a documented object's ability to handle multithreaded programming.
+
+    \section1 Alphabetical List
+
+    \l {16-qdoc-commands-status.html#compat}{\\compat},
+    \l {16-qdoc-commands-status.html#internal}{\\internal},
+    \l {16-qdoc-commands-status.html#obsolete}{\\obsolete},
+    \l {16-qdoc-commands-status.html#preliminary}{\\preliminary},
+    \l {16-qdoc-commands-status.html#since}{\\since}
+
+    \section1 Command Description
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\preliminary \target preliminary
+        \o \bold {The \\preliminary command indicates that the
+           referenced function is under development.}
+
+           The command must stand on its own line.
+
+           The \\preliminary command expands to a notification in the
+           function documentation, and marks the function as
+           preliminary when it appears in lists. For example:
+
+           \code
+           / *!
+               \preliminary
+
+               Returns information about the joining properties of the
+               character (needed for certain languages such as
+               Arabic).
+           * /
+           QChar::Joining QChar::joining() const
+           {
+               return ::joining(*this);
+           }
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h3>
+               <a href="http://qt.nokia.com/doc/4.0/qchar.html#Joining-enum">Joining</a>
+               QChar::joining () const</h3>
+               \endraw
+
+               \bold {This function is under development and
+               is subject to change.}
+
+               Returns information about the joining properties of the
+               character (needed for certain languages such as
+               Arabic).
+           \endquotation
+
+           And the function's entry in QChar's list of functions will
+           be rendered as
+
+         \quotation
+             \list
+             \o ...
+             \o Joining
+                \l {http://qt.nokia.com/doc/4.0/qchar.html#Joining-enum}
+                   {joining}()
+                const   \c (preliminary)
+             \o ...
+             \endlist
+         \endquotation
+
+    \row
+        \o \bold \\obsolete \target obsolete
+        \o \bold {The \\obsolete command indicates that the referenced
+           function no longer should be used in new code;
+           there is no guarantee for how long it will remain in
+           the library.}
+
+           The command must stand on its own line.
+
+           When generating the reference documentation for a class,
+           QDoc will create and link to a separate page documenting
+           its obsolete functions.  Usually an equivalent function is
+           provided as an alternative.
+
+           For example:
+
+           \code
+           / *!
+               \fn MyClass::MyObsoleteFunction
+               \obsolete
+
+               Use MyNewFunction() instead.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h1>Obsolete Members for MyClass</h1>
+               \endraw
+
+               \bold {The following class members are obsolete.} They
+               are provided to keep old source code working. We
+               strongly advise against using them in new code.
+
+               ...
+
+               \list
+                   \o void MyObsoleteFunction() \c (obsolete)
+                   \o ...
+               \endlist
+
+               \raw HTML
+               <hr />
+               <h2>Member Function Documentation</h2>
+               <h3>void MyObsoleteFunction ()</h3>
+               <p>Use MyNewFunction() instead.</p>
+               \endraw
+
+               ...
+           \endquotation
+
+           in myclass-obsolete.html
+
+
+    \row
+        \o \bold \\compat \target compat
+        \o \bold {The \\compat command indicates that the referenced class
+           or function is part of the support library provided to keep
+           old source code working.}
+
+           The command must stand on its own line.
+
+           Usually an equivalent function or class is provided as an
+           alternative.
+
+           If the command is used within the documentation of a class,
+           the command expands to a warning that the referenced class
+           is part of the support library. The warning is located on
+           top of the associated documentation. For example:
+
+           \code
+           / *!
+               \class MyQt3SupportClass
+               \compat
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \bold {This class is part of the Qt 3 support
+               library.} It is provided to keep old source code
+               working. We strongly advise against using it in new
+               code. See the \l
+               {http://qt.nokia.com/doc/4.0/porting4.html}{Porting
+               Guide} for more information.
+           \endquotation
+
+           on the top of the MyQt3SupportClass class reference.
+
+           If the command is used when documenting a function, QDoc
+           will create and link to a separate page documenting Qt 3
+           support members when generating the reference documentation
+           for the associated class. For example:
+
+           \code
+           / *!
+               \fn MyClass::MyQt3SupportMemberFunction
+               \compat
+
+               Use MyNewFunction() instead.
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h1>Qt 3 Support Members for MyClass</h1>
+               \endraw
+
+               \bold {The following class members are part of the Qt
+               3 support layer.} They are provided to help you port
+               old code to Qt 4. We advise against using them in new
+               code.
+
+               ...
+
+               \list
+                   \o void MyQt3SupportMemberFunction()
+                   \o ...
+               \endlist
+
+               \raw HTML
+               <hr />
+               <h2>Member Function Documentation</h2>
+               <h3>void MyQt3SupportMemberFunction ()</h3>
+               <p>Use MyNewFunction() instead.</p>
+               \endraw
+
+               ...
+           \endquotation
+
+           in myclass-qt3.html
+
+
+    \row
+        \o \bold \\internal \target internal
+        \o \bold {The \\internal command indicates that the referenced
+           function is not part of the public interface.}
+
+           The command must stand on its own line.
+
+           QDoc ignores the documentation as well as the documented
+           item, when generating the associated class reference
+           documenation. For example:
+
+           \code
+           / *!
+               \internal
+
+               Tries to find the decimal separator. If it can't find
+               it and the thousand delimiter is != '.' it will try to
+               find a '.';
+           * /
+           int QDoubleSpinBoxPrivate::findDelimiter
+                   (const QString &str, int index) const
+           {
+               int dotindex = str.indexOf(delimiter, index);
+               if (dotindex == -1 && thousand != dot && delimiter != dot)
+                   dotindex = str.indexOf(dot, index);
+               return dotindex;
+           }
+           \endcode
+
+           in qspinbox.cpp, will not be rendered at all.
+
+    \row
+        \o \bold \\since \target since
+        \o \bold {The \\since command tells in which minor release
+           the associated functionality was added.}
+
+           For example:
+
+           \code
+           / *!
+               \since 4.1
+
+               Returns an icon for \a standardIcon.
+
+               ...
+
+               \sa standardIconImplementation(), standardPixmap()
+           * /
+           QIcon QStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const
+           {
+           }
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h3>QIcon QStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const</h3>
+               \endraw
+
+               This function was introduced in Qt version 4.1
+
+               Returns an icon for \a standardIcon.
+
+               ...
+
+               See also \l
+               {QStyle::standardIconImplementation()}{standardIconImplementation()}
+               and \l {QStyle::standardPixmap()}{standardPixmap()}.
+               \endquotation
+
+           QDoc generates the "Qt" reference from the \l
+           {25-qdoc-configuration-derivedprojects.html#project}{\c
+           project} configuration variable. For that reason this
+           reference will change according to the current
+           documentation project.
+
+           See also \l
+           {25-qdoc-configuration-derivedprojects.html#project}{\c
+           project}.
+
+    \endtable
+*/
+
+/*!
+    \page 17-qdoc-commands-thread.html
+    \previouspage Status Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Relating Commands
+
+    \title Thread Support Commands
+
+    The thread support commands specify the level of support for
+    multithreaded programming of a class or function.
+
+    \section1 Alphabetical List
+
+    \l {17-qdoc-commands-thread.html#nonreentrant}{\\nonreentrant},
+    \l {17-qdoc-commands-thread.html#reentrant}{\\reentrant},
+    \l {17-qdoc-commands-thread.html#threadsafe}{\\threadsafe}
+
+    \section1 General Description
+
+    There are three levels of support for multithreaded programming of
+    a class or function: \c threadsafe, \c reentrant and \c
+    nonreentrant.
+
+    The default is \c nonreentrant which means that the associated
+    class or function cannot be called by multiple threads. \c
+    Reentrant and \c threadsafe are levels primarily used for classes.
+
+    \c Reentrant means that all the functions in the referenced class
+    can be called simultaneously by multiple threads, provided that
+    each invocation of the functions reference unique data. While \c
+    threadsafe means that all the functions in the referenced class
+    can be called simultaneously by multiple threads even when each
+    invocation references shared data.
+
+    When a class is declared \c reentrant or \c threadsafe, using the
+    \l {reentrant}{\\reentrant} and \l {threadsafe}{\\threadsafe}
+    commands respectively, functions in the referenced class can be
+    declared \c nonreentrant, using the \l
+    {nonreentrant}{\\nonreentrant} command, excluding the functions
+    from the general view.
+
+    For example:
+
+    \code
+    / *!
+        \class QLocale
+        \brief The QLocale class converts between numbers and their
+        string representations in various languages.
+
+        \reentrant
+        \ingroup i18n
+        \ingroup text
+        \mainclass
+
+        QLocale is initialized with a language/country pair in its
+        constructor and offers number-to-string and string-to-number
+        conversion functions similar to those in QString.
+
+        ...
+    * /
+
+    / *!
+        \nonreentrant
+
+        Sets the global default locale to \a locale. These values are
+        used when a QLocale object is constructed with no
+        arguments. If this function is not called, the system's locale
+        is used.
+
+        \warning In a multithreaded application, the default locale
+        should be set at application startup, before any non-GUI
+        threads are created.
+
+        \sa system() c()
+    * /
+    void QLocale::setDefault(const QLocale &locale)
+    {
+        default_d = locale.d;
+    }
+    \endcode
+
+    will be rendered as
+
+    \quotation
+        \raw HTML
+            <h1><center>QLocale Class Reference</center></h1>
+        \endraw
+
+        The QLocale class converts between numbers and their string
+        representations in various languages. More...
+
+        \code
+        #include <QLocale>
+        \endcode
+
+        \bold {Note:} All the functions in this class are \l
+        {threads.html#reentrant}{reentrant}, except \l
+        {QLocale::setDefault()}{setDefault()}.
+
+        ...
+
+        \raw HTML
+            <hr />
+            <h2>Member Type Documentation</h2>
+        \endraw
+
+        ...
+
+        \raw HTML
+            <h3>void QLocale::setDefault ( const QLocale & locale ) </h3>
+        \endraw
+
+        Sets the global default locale to locale. These values are
+        used when a QLocale object is constructed with no
+        arguments. If this function is not called, the system's locale
+        is used.
+
+        \warning In a multithreaded application, the default locale
+        should be set at application startup, before any non-GUI
+        threads are created.
+
+        \warning This function is not reentrant.
+
+        See also \l {QLocale::system()}{system()} and \l
+        {QLocale::c()}{c()}.
+
+        ...
+    \endquotation
+
+    As shown above, QDoc generates a notification when a class is
+    declared reentrant, and lists the exceptions (the declared
+    nonreentrant functions). A link to the general documentation on \l
+    {threads.html#reentrant}{reentrancy and thread-safety} is
+    included.  In addition a warning, "\bold Warning: This function is
+    not reentrant.", is generated in the nonreentrant functions'
+    documentation.
+
+    QDoc will generate the same notification and warnings when a class
+    is declared threadsafe.
+
+    For more information see the general documentation on \l
+    {threads.html#reentrant}{reentrancy and thread-safety}.
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\threadsafe \target threadsafe
+        \o \bold {The \\threadsafe command indicates that the
+           associated class or function can be called simultaneously by
+           multiple threads even when each invocation references
+           shared data.}
+
+           The command must stand on its own line.
+
+           The generated documentation resulting from using the
+           \\threadsafe command is similar to the result of using the
+           \l {reentrant}{\\reentrant} command. For an example, see
+           the \l {General Description} section.
+
+           See also \l{reentrant}{\\reentrant} and
+           \l{nonreentrant}{\\nonreentrant}.
+
+    \row
+        \o \bold \\reentrant \target reentrant
+        \o \bold {The \\reentrant command indicates that the associated
+           class or function  can be called simultaneously
+           by multiple threads, provided that each invocation of the
+           functions reference unique data.}
+
+           The command must stand on its own line.
+
+           For an example, see the \l {General Description} section.
+
+           See also \l{nonreentrant}{\\nonreentrant} and
+            \l{threadsafe}{\\threadsafe}.
+
+    \row
+        \o \bold \\nonreentrant \target nonreentrant
+        \o \bold {The \\nonreentrant command indicates that the
+           associated class or function cannot be called by
+           multiple threads.}
+
+           The command must stand on its own line.
+
+           For an example, see the \l {General Description} section.
+
+           See also \l{reentrant}{\\reentrant} and
+           \l{threadsafe}{\\threadsafe}.
+
+    \endtable
+*/
+
+/*!
+    \page 18-qdoc-commands-relating.html
+    \previouspage Thread Support Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Grouping Commands
+
+    \title Relating Commands
+
+    The relation commands discribe how the documented object relates
+    to its context: Whether it is an overloaded function, a
+    reimplemented function or a global function related to a specified
+    class or header file.
+
+    \section1 Alphabetical List
+
+    \l {18-qdoc-commands-relating.html#overload}{\\overload},
+    \l {18-qdoc-commands-relating.html#reimp}{\\reimp},
+    \l {18-qdoc-commands-relating.html#relates}{\\relates},
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\overload \target overload
+        \o \bold {The \\overload command indicates that the 
+           function is a secondary overload of its name.}
+
+           The command must stand on its own line.
+
+           For any overloaded function (except constructors), QDoc
+           expects one primary version of the function and all the 
+	   the overloads marked with the \bold{\\overload command}.
+           The primary version should be fully documented. Each 
+	   overload can have whatever extra documentation you want
+	   to add for just that overload. 
+
+	   From Qt 4.5, you can include the function name plus '()'
+	   as a parameter to the \bold{\\overload} command, which 
+	   will include a standard \i{This function overloads...} 
+	   line of text with a link to the documentation for the 
+	   primary version of the function. 
+
+	   For example:
+
+           \code
+           / *!
+               \overload addAction()
+
+               This convenience function creates a new action with an
+               \a icon and some \a text. The function adds the newly
+               created action to the menu's list of actions, and
+               returns it.
+
+               \sa QWidget::addAction()
+           * /
+           QAction *QMenu::addAction(const QIcon &icon, const QString &text)
+           {
+               QAction *ret = new QAction(icon, text, this);
+               addAction(ret);
+               return ret;
+           }
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+               <h3><a href="http://qt.nokia.com/doc/4.0/qaction.html">QAction</a>
+               * QMenu::addAction ( const QIcon & <i>icon</i>,
+               const QString & <i>text</i> )
+               </h3>
+               \endraw
+
+	       This function overloads \l {http://qt.nokia.com/doc/4.0/qwidget.html#addAction}{addAction()}
+
+               This convenience function creates a new action with an
+               \i icon and some \i text. The function adds the newly
+               created action to the menu's list of actions, and
+               returns it.
+
+               See also
+               \l {http://qt.nokia.com/doc/4.0/qwidget.html#addAction}
+               {QWidget::addAction}().
+           \endquotation
+
+	   If you don't include the function name with the
+	   \bold{\\overlaod} command, then instead of the "This
+	   function overloads..." line with the link to the
+	   documentation for the primary version, you get the old
+	   standard line:
+
+	   \quotation
+               This is an overloaded member function, provided for
+               convenience. 
+	   \endquotation.
+
+    \row
+        \o \bold \\reimp \target reimp
+        \o \bold {The \\reimp command indicates that the
+           referenced function is a reimplementation of a virtual function,
+           where the reimplementation has no effect on the interface.}
+
+           The command must stand on its own line.
+
+           QDoc will omit the reimplemented function from the class
+           reference. For example:
+
+           \code
+           / *!
+               \reimp
+           * /
+           void QToolButton::nextCheckState()
+           {
+               Q_D(QToolButton);
+               if (!d->defaultAction)
+                   QAbstractButton::nextCheckState();
+               else
+                   d->defaultAction->trigger();
+           }
+           \endcode
+
+           will not be rendered at all; only a link to the inherited
+           QAbstractButton::nextCheckState() will appear in the
+           documentation.
+
+    \row
+        \o \bold \\relates \target relates
+        \o \bold {The \\relates command attaches the documentation of
+           a global function to that of a related class or header file.}
+
+           The command's argument is a class name, an the command (and
+           its argument) must stand on its own line.
+
+           \code
+           / *!
+               \relates QChar
+
+               Reads a char from the stream \a in into char \a chr.
+
+               \sa {Format of the QDataStream operators}
+           * /
+           QDataStream &operator>>(QDataStream &in, QChar &chr)
+           {
+               quint16 u;
+               in >> u;
+               chr.unicode() = ushort(u);
+               return in;
+           }
+           \endcode
+
+           will be rendered with the QChar documentation.
+
+    \endtable
+*/
+
+/*!
+    \page 19-qdoc-commands-grouping.html
+    \previouspage Relating Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Title Commands
+
+    \title Grouping Commands
+
+    The grouping commands relate classes to defined groups and
+    modules. The groups are used when generating lists of related
+    classes in the documentation, while the modules are elements of
+    Qt's structure.
+
+    \section1 Alphabetical List
+
+    \l {19-qdoc-commands-grouping.html#ingroup}{\\ingroup},
+    \l {19-qdoc-commands-grouping.html#inmodule}{\\inmodule},
+    \l {19-qdoc-commands-grouping.html#mainclass}{\\mainclass},
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\mainclass \target mainclass
+        \o \bold {The \\mainclass command relates the documented class to
+           a group called mainclasses.}
+
+           The command must stand on its own line.
+
+           For example:
+
+           \code
+           / *!
+               \class QWidget qwidget.h
+               \brief The QWidget class is the base class of
+               all user interface objects.
+
+               \mainclass
+
+               ...
+           * /
+           \endcode
+
+           will ensure that the QWidget class is included in the \c
+           mainclasses group, which means, for example, that the class
+           will appear on the list created by calling the \l
+           {generatelist}{\\generatelist} command with the \c
+           mainclasses argument:
+
+           \l http://qt.nokia.com/doc/4.0/mainclasses.html
+
+           See also \l {generatelist}{\\generatelist}.
+
+    \row
+        \o \bold \\ingroup \target ingroup
+
+        \o \bold {The \\ingroup command indicates that the given
+           overview or documented class belongs to a certain group of
+           related docmentation.}
+
+           A class or overview may belong to many groups.
+
+           The \\ingroup command's argument is a group name, but note
+           that the command considers the rest of the line as part of
+           its argument. Make sure that the group name is followed by
+           a linebreak. For example:
+
+           \code
+           / *!
+               \class QDir
+               \brief The QDir class provides access to directory
+                      structures and their contents.
+
+               \ingroup io
+               ...
+           * /
+           \endcode
+
+           will ensure that the QDir class is included in the \c io
+           group, which means, for example, that QDir will appear on
+           the list created by calling the \l {group}{\\group} command
+           with the \c io argument.
+
+           Note that to list overviews that are related to a given
+           group, you must generate the list exlicitly by using the \l
+           {generatelist}{\\generatelist} command with the \c related
+           argument.
+
+           See also \l {group}{\\group}.
+    \row
+        \o \bold \\inmodule \target inmodule
+        \o \bold {The \\inmodule command relates the documented class
+           to the module specified by the command's argument.}
+
+           For the basic classes in Qt, a class's module is determined
+           by its location, i.e. its directory. However, for
+           extensions, like ActiveQt and Qt Designer, a class needs to
+           be related to a module explicitly.
+
+           The command's argument is a module name, but note that the
+           command considers the rest of the line as part of its
+           argument. Make sure that the module name is followed by a
+           linebreak. For example:
+
+           \code
+           /*!
+               \class QDesignerTaskMenuExtension
+               \inmodule QtDesigner
+           * /
+           \endcode
+
+           will ensure that the QDesignerTaskMenuExtension class is
+           included in the \c QtDesigner module, which means, for
+           example, that the class will appear on the list created by
+           calling the \l {generatelist}{\\generatelist} command with
+           the \c {{classesbymodule QtDesigner}} argument.
+
+           See also \l {module}{\\module} and \l
+           {generatelist}{\\generatelist}.
+    \endtable
+*/
+
+/*!
+    \page 20-qdoc-commands-title.html
+    \previouspage Grouping Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage QDoc Configuration
+
+    \title Title Commands
+
+    In general a title command considers everything that follows it
+    until the first line break as its argument.  If the title needs to
+    be spanned over several lines, make sure to end each line (except
+    the last one) with a backslash.
+
+    \section1 Alphabetical List
+
+    \l {20-qdoc-commands-title.html#title}{\\title},
+    \l {20-qdoc-commands-title.html#subtitle}{\\subtitle}
+
+    \section1 Command Descriptions
+
+    \table
+    \header
+        \o Command
+        \o Description
+
+    \row
+        \o \bold \\title \target title
+        \o \bold {The \\title command sets the title for a
+           documentation page, or allows you to override it.}
+
+           For example:
+
+           \code
+           / *!
+               \page signalandslots.html
+
+               \title Signals and Slots
+
+               Signals and slots are used for communication between
+               objects. The signals and slots mechanism is a central
+               feature of Qt and probably the part that differs most
+               from the features provided by other frameworks.
+
+               ...
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+                   <h1><center>Signal and Slots</center></h1>
+               \endraw
+
+               Signals and slots are used for communication between
+               objects. The signals and slots mechanism is a central
+               feature of Qt and probably the part that differs most
+               from the features provided by other frameworks.
+
+               ...
+           \endquotation
+           See also \l {subtitle}{\\subtitle}.
+
+    \row
+        \o \bold \\subtitle \target subtitle
+        \o \bold {The \\subtitle command sets a subtitle for a
+           documentation page.}
+
+           For example:
+
+           \code
+           / *!
+               \page qtopiacore-overview.html
+
+               \title Qtopia Core
+               \subtitle Qt for Embedded Linux
+
+               Qt/Embedded, the embedded Linux port of Qt, is a
+               complete and self-contained C++ GUI and platform
+               development tool for Linux-based embedded development.
+
+               ...
+           * /
+           \endcode
+
+           will be rendered as
+
+           \quotation
+               \raw HTML
+                   <h1><center>Qtopia Core</center></h1>
+                   <h2><center>Qt for Embedded Linux</center></h2>
+               \endraw
+
+               Qt/Embedded, the embedded Linux port of Qt, is a
+               complete and self-contained C++ GUI and platform
+               development tool for Linux-based embedded development.
+
+               ...
+           \endquotation
+
+           See also \l {title}{\\title}.
+    \endtable
+*/
+
+/*!
+    \page 21-0-qdoc-configuration.html
+    \previouspage Title Commands
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage General Variables
+
+    \title QDoc Configuration
+
+    \tableofcontents
+
+    \list
+    \o \l {Supporting Derived Projects}
+    \o \l {QDoc Compatibility}
+    \endlist
+
+    When running QDoc to generate the documentation, you must specify
+    a configuration file on the command line:
+
+    \quotation
+        \bold {/currentdirectory$ qdoc3 my-documentation.qdocconf}
+    \endquotation
+
+    \section1 General Description
+
+    The configuration file is a list of entries of entries of the form
+    \i {"variable = value"}. Using the configuration variables, you
+    can define where QDoc should find the various source files, images
+    and examples, where to put generated documentation etc. The
+    configuration file can also contain directives like \c
+    include. For an example, see the \l minimum.qdocconf file.
+
+    In addition, you can use some particular configuration variables
+    to make QDoc support derived projects, i.e make the projects, for
+    example Qt Solutions, contain links to the online Qt
+    documentation. These variables are documented in the \l
+    {Supporting Derived projects} section. In this section you can
+    also find out how to use these variables to support your derived
+    projects.
+
+    If some of the variable keys have the same values, they can be set
+    at the same time. For example:
+
+    \code
+    {header, source}dirs = kernel
+    \endcode
+
+    is equivalent to
+
+    \code
+    headerdirs = kernel
+    sourcedirs = kernel
+    \endcode
+
+    A variable's value can be set using either '=' or '+='. The
+    difference is that '=' overrides any previously set value, while
+    '+=' only adds the value to the previously set ones.
+
+    In general, some of the variables accepts a list of strings as
+    their value, while others only accept a single string. If you
+    provide a variable of the latter type with several strings they
+    will simply be concatenated. The quotes around the value string
+    are optional. But applying them allows you to use special
+    characters like '=' and ' \" ' within the string. For example:
+
+    \code
+    HTML.postheader = "<a href=\"index.html\">Home</a>"
+    \endcode
+
+    If an entry spans many lines, use a backslash at the end of every
+    line but the last:
+
+    \code
+    sourcedirs = kernel \
+                 tools \
+                 widgets
+    \endcode
+
+    \section1 Configuration Variables
+
+    \section2 Alphabetical List
+
+    \l {22-qdoc-configuration-generalvariables.html#alias}{alias},
+    \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoredirectives}
+       {Cpp.ignoredirectives},
+    \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoretoken}
+       {Cpp.ignoretokens},
+    \l {22-qdoc-configuration-generalvariables.html#definesvariable}{defines},
+    \l {22-qdoc-configuration-generalvariables.html#edition}{edition},
+    \l {22-qdoc-configuration-generalvariables.html#exampledirs}{exampledirs},
+    \l {22-qdoc-configuration-generalvariables.html#examples}{examples},
+    \l {22-qdoc-configuration-generalvariables.html#examples.fileextensions}
+       {examples.fileextensions},
+    \l {22-qdoc-configuration-generalvariables.html#extraimages}{extraimages},
+    \l {22-qdoc-configuration-generalvariables.html#falsehoods}{falsehoods},
+    \l {22-qdoc-configuration-generalvariables.html#headerdirs}{headerdirs},
+    \l {22-qdoc-configuration-generalvariables.html#headers}{headers},
+    \l {22-qdoc-configuration-generalvariables.html#headers.fileextensions}
+       {headers.fileextensions},
+    \l {24-qdoc-configuration-htmlvariables.html#HTML.footer}{HTML.footer},
+    \l {24-qdoc-configuration-htmlvariables.html#HTML.postheader}
+       {HTML.postheader},
+    \l {24-qdoc-configuration-htmlvariables.html#HTML.style}{HTML.style},
+    \l {22-qdoc-configuration-generalvariables.html#imagedirs}{imagedirs},
+    \l {22-qdoc-configuration-generalvariables.html#images}{images},
+    \l {22-qdoc-configuration-generalvariables.html#images.fileextensions}
+       {images.fileextensions},
+    \l {22-qdoc-configuration-generalvariables.html#language}{language},
+    \l {22-qdoc-configuration-generalvariables.html#macro}{macro},
+    \l {22-qdoc-configuration-generalvariables.html#outputdir}{outputdir},
+    \l {22-qdoc-configuration-generalvariables.html#outputformats}
+       {outputformats},
+    \l {22-qdoc-configuration-generalvariables.html#slow}{slow},
+    \l {22-qdoc-configuration-generalvariables.html#sourcedirs}{sourcedirs},
+    \l {22-qdoc-configuration-generalvariables.html#sources}{sources},
+    \l {22-qdoc-configuration-generalvariables.html#sources.fileextensions}
+       {sources.fileextensions},
+    \l {22-qdoc-configuration-generalvariables.html#spurious}{spurious},
+    \l {22-qdoc-configuration-generalvariables.html#tabsize}{tabsize},
+    \l {22-qdoc-configuration-generalvariables.html#version}{version},
+    \l {22-qdoc-configuration-generalvariables.html#versionsym}{versionsym}
+
+    \section2 Categories
+
+    \list
+    \o \l {General Variables}
+    \o \l {C++ Specific Variables}
+    \o \l {HTML Specific Variables}
+    \endlist
+
+    \section1 Configuration File Examples
+
+    \list
+    \o A minimum configuration file: \l minimum.qdocconf
+    \o The Qt configuration file: \l qt.qdocconf
+    \endlist
+*/
+
+/*!
+    \page 21-1-minimum-qdocconf.html
+    \previouspage QDoc Configuration
+    \contentspage QDoc Manual - Table of Contents
+
+    \title minimum.qdocconf
+
+    \quotefile examples/minimum.qdocconf
+*/
+
+/*!
+    \page 21-2-qt-qdocconf.html
+    \previouspage QDoc Configuration
+    \contentspage QDoc Manual - Table of Contents
+
+    \title qt.qdocconf
+
+    \quotefile files/qt.qdocconf
+*/
+
+/*!
+    \page 22-qdoc-configuration-generalvariables.html
+    \previouspage QDoc Configuration
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Creating Help Project Files
+
+    \title General Variables
+
+    With the general QDoc configuration variables, you can define
+    where QDoc will find the various source files it needs to generate
+    the documentation, as well as the directory to put the generated
+    documentation. You can also do some minor manipulation of QDoc
+    itself, controlling its output and processing behavior.
+
+    \section1 Alphabetical List
+
+    \l {22-qdoc-configuration-generalvariables.html#alias}{alias},
+    \l {22-qdoc-configuration-generalvariables.html#codeindent}{codeindent},
+    \l {22-qdoc-configuration-generalvariables.html#definesvariable}{defines},
+    \l {22-qdoc-configuration-generalvariables.html#edition}{edition},
+    \l {22-qdoc-configuration-generalvariables.html#exampledirs}{exampledirs},
+    \l {22-qdoc-configuration-generalvariables.html#examples}{examples},
+    \l {22-qdoc-configuration-generalvariables.html#examples.fileextensions}
+       {examples.fileextensions},
+    \l {22-qdoc-configuration-generalvariables.html#extraimages}{extraimages},
+    \l {22-qdoc-configuration-generalvariables.html#falsehoods}{falsehoods},
+    \l {22-qdoc-configuration-generalvariables.html#generateindex}{generateindex},
+    \l {22-qdoc-configuration-generalvariables.html#headerdirs}{headerdirs},
+    \l {22-qdoc-configuration-generalvariables.html#headers}{headers},
+    \l {22-qdoc-configuration-generalvariables.html#headers.fileextensions}
+       {headers.fileextensions},
+    \l {22-qdoc-configuration-generalvariables.html#imagedirs}{imagedirs},
+    \l {22-qdoc-configuration-generalvariables.html#images}{images},
+    \l {22-qdoc-configuration-generalvariables.html#images.fileextensions}
+       {images.fileextensions},
+    \l {22-qdoc-configuration-generalvariables.html#language}{language},
+    \l {22-qdoc-configuration-generalvariables.html#macro}{macro},
+    \l {22-qdoc-configuration-generalvariables.html#outputdir}{outputdir},
+    \l {22-qdoc-configuration-generalvariables.html#outputformats}
+       {outputformats},
+    \l {22-qdoc-configuration-generalvariables.html#slow}{slow},
+    \l {22-qdoc-configuration-generalvariables.html#sourcedirs}{sourcedirs},
+    \l {22-qdoc-configuration-generalvariables.html#sources}{sources},
+    \l {22-qdoc-configuration-generalvariables.html#sources.fileextensions}
+       {sources.fileextensions},
+    \l {22-qdoc-configuration-generalvariables.html#spurious}{spurious},
+    \l {22-qdoc-configuration-generalvariables.html#tabsize}{tabsize},
+    \l {22-qdoc-configuration-generalvariables.html#tagfile}{tagfile},
+    \l {22-qdoc-configuration-generalvariables.html#version}{version},
+    \l {22-qdoc-configuration-generalvariables.html#versionsym}{versionsym}
+
+    \section1 Variable Descriptions
+
+    \table
+
+    \header
+        \o Variable
+        \o Description
+
+    \row
+        \o \bold alias \target alias
+        \o \bold {The \c alias variable renames a QDoc command.}
+
+           The general syntax is \tt {alias.\i{original-command-name}
+           = \i temporary-command-name}.
+
+           For example:
+
+           \code
+           alias.i = e
+           \endcode
+
+           renames the built-in command \\i (italics) to \\e.
+
+           The \c alias variable is often used for compatibility
+           reasons; for more information see the \l {QDoc
+           Compatibility}{compatibility section}.
+
+           See also \l macro.
+
+    \row
+        \o \bold codeindent \target codeindent
+        \o \bold {The \c codeindent variable specifies the level of
+           indentation that QDoc uses when writing code snippets.}
+
+           QDoc originally used a hard-coded value of four spaces for
+           code indentation to ensure that code snippets could be easily
+           distinguished from surrounding text. Since we can use
+           \l{HTML Specific Variables#HTML.stylesheets}{stylesheets} to
+           adjust the appearance of certain types of HTML elements, this
+           level of indentation is not always required.
+
+    \row
+        \o \bold defines \target definesvariable
+        \o \bold {The \c defines variable specifies the C++ preprocessor
+           symbols that QDoc will recognize and respond to.}
+
+           When a preprocessor symbol is specified using the \c
+           defines variable, you can also use the \l {if}{\\if}
+           command to enclose documentation that only will be included
+           if the preprocessor symbol is defined.
+
+           The values of the variable are regular expressions (see
+           QRegExp for details). By default, no symbol is defined,
+           meaning that code protected with #ifdef...#endif will be
+           ignored.
+
+           For example:
+
+           \code
+           defines = Q_QDOC \
+                     QT_.*_SUPPORT \
+                     QT_.*_LIB \
+                     QT_COMPAT \
+                     QT3_SUPPORT \
+                     Q_WS_.* \
+                     Q_OS_.* \
+                     Q_BYTE_ORDER \
+                     __cplusplus
+           \endcode
+
+           ensures that QDoc will process the code that requires these
+           symbols to be defined. For example:
+
+           \code
+           #ifdef Q_WS_WIN
+               HDC getDC() const;
+               void releaseDC(HDC) const;
+           #endif
+           \endcode
+
+           Since the Q_WS_.* regular expression (specified using the
+           \c defines variable) matches Q_WS_WIN, QDoc will process
+           the code within #ifdef and #endif in our example.
+
+           You can also define preprocessor symbols manually on the
+           command line using the -D option. For example:
+
+           \code
+               currentdirectory$ qdoc3 -Dconsoleedition qt.qdocconf
+           \endcode
+
+           In this case the -D option ensures that the \c
+           consoleedition preprocessor symbol is defined when QDoc
+           processes the source files defined in the qt.qdocconf file.
+
+           See also \l falsehoods and \l {if}{\\if}.
+
+    \row
+        \o \bold edition \target edition
+        \o \bold {The \c edition variable specifies which modules are
+           included in each edition of a package, and provides QDoc
+           with information to provide class lists for each edition.}
+
+           This feature is mostly used when providing documentation
+           for Qt packages.
+
+           The \c edition variable is always used with a particular
+           edition name to define the modules for that edition:
+
+           \code
+           edition.Console      = QtCore QtNetwork QtSql QtXml
+           edition.Desktop      = QtCore QtGui QtNetwork QtOpenGL QtSql QtXml \
+                                  QtDesigner QtAssistant Qt3Support QAxContainer \
+                                  QAxServer
+           edition.DesktopLight = QtCore QtGui Qt3SupportLight
+           \endcode
+
+           In the above examples, the \c Console edition only includes
+           the contents of four modules. Only the classes from these
+           modules will be used when the
+           \l{Miscellaneous Commands#generatelist}{generatelist} command
+           is used to generate a list of classes for this edition:
+
+           \code
+           \generatelist{classesbyedition Console}
+           \endcode
+
+    \row
+        \o \bold exampledirs \target exampledirs
+        \o \bold {The \c exampledirs variable specifies the directories
+           containing the source code of the example files.}
+
+           The \l {examples}{\c examples} and \c exampledirs variables
+           are used by the \l {quotefromfile}{\\quotefromfile}, \l
+           {quotefile}{\\quotefile} and \l {example}{\\example}
+           commands.  If both the \l {examples}{\c examples} and \c
+           exampledirs variables are defined, QDoc will search in
+           both, first in \l {examples}{\c examples} then in \c
+           exampledirs.
+
+           QDoc will search through the directories in the specified
+           order, and accept the first matching file it finds. It will
+           only search in the specified directories, \i not in
+           subdirectories.
+
+           For example:
+
+           \code
+           exampledirs = $QTDIR/doc/src \
+                         $QTDIR/examples \
+                         $QTDIR \
+                         $QTDIR/qmake/examples
+
+           examples    = $QTDIR/examples/widgets/analogclock/analogclock.cpp
+           \endcode
+
+           When processing
+
+           \code
+           \quotefromfile widgets/calculator/calculator.cpp
+           \endcode
+
+           QDoc will then see if there exists a file called \c
+           calculator.cpp listed as a value in the \l {examples}{\c
+           examples} variable. If it doesn't, it will search in the \c
+           exampledirs variable, and first see if there exists a file
+           called
+
+           \code
+           $QTDIR/doc/src/widgets/calculator/calculator.cpp
+           \endcode
+
+           If it doesn't, QDoc will continue looking for a file
+           called
+
+           \code
+           $QTDIR/examples/widgets/calculator/calculator.cpp
+           \endcode
+
+           and so forth.
+
+           See also \l examples.
+
+    \row
+        \o \bold examples \target examples
+        \o \bold {The \c examples variable allows you to specify individual
+           example files in addition to those located in the directories
+           specified by the \l {exampledirs}{\c exampledirs} variable.}
+
+           The \c examples and \l {exampledirs}{\c exampledirs}
+           variables are used by the \l
+           {quotefromfile}{\\quotefromfile}, \l
+           {quotefile}{\\quotefile} and \l {example}{\\example}
+           commands. If both the \c examples and \l {exampledirs}{\c
+           exampledirs} variables are defined, QDoc will search in
+           both, first in \c examples then in \l {exampledirs}{\c
+           exampledirs}.
+
+           QDoc will search through the values listed for the \c
+           examples variable, in the specified order, and accept
+           the first one it finds.
+
+           For an extensive example, see the \l {exampledirs}{\c
+           exampledirs} command. But note that if you know the file is
+           listed in the \c examples variable, you don't need to
+           specify its path:
+
+           \code
+               \quotefromfile calculator.cpp
+           \endcode
+
+           See also \l exampledirs.
+
+    \row
+        \o \bold examples.fileextensions \target examples.fileextensions
+        \o \bold {The \c examples.fileextensions variable specifies the
+           file extensions that qdoc will look for when collecting example
+           files for display in the documentation.}
+
+           The default extensions are *.cpp, *.h, *.js, *.xq, *.svg, *.xml
+           and *.ui. However, if 
+
+           The extensions are given as standard wildcard expressions.
+           You can add a file extension to the filter using '+='. For
+           example:
+
+           \code
+           examples.fileextensions += *.qrc
+           \endcode
+
+           See also \l{headers.fileextensions}.
+
+    \row
+        \o \bold extraimages \target extraimages
+        \o \bold {The \c extraimages variable tells QDoc to incorporate
+           specific images in the generated documentation.}
+
+           QDoc will not recognize images used within HTML (or any
+           other markup language). If we want the images to be copied
+           from the directories specified by \l {imagedirs}{\c
+           imagedirs} (the images in question must be located in these
+           directories) to the output directory, we must specify the
+           images using the \c extraimages variable.
+
+           The general syntax is \tt {extraimages.\i{format} = \i
+           image}. The file extension is optional.
+
+           For example, in \l qt.qdocconf we use a couple of images
+           within the HTML.postheader variable which value is pure
+           HTML. For that reason, these images are specified using the
+           \c extraimages variable:
+
+           \code
+           extraimages.HTML = qt-logo
+           \endcode
+
+           See also \l images and \l imagedirs.
+
+    \row
+        \o \bold falsehoods \target falsehoods
+        \o \bold {The \c falsehoods variable defines the truth value of
+           specified preprocessor symbols as false.}
+
+           If this variable is not set for a preprocessor symbol, QDoc
+           assumes its truth value is true. The exception is '0',
+           which value always is false.
+
+           QDoc will recognize, and is able to evaluate, the following
+           preprocessor syntax:
+
+           \code
+           #ifdef NOTYET
+               ...
+           #endif
+
+           #if defined (NOTYET)
+               ...
+           #end if
+           \endcode
+
+           However, faced with unknown syntax like
+
+           \code
+           #if NOTYET
+               ...
+           #endif
+           \endcode
+
+           QDoc will evaluate it as true by default, \i unless the
+           preprocessor symbol is specified within the \c falsehoods
+           variable entry:
+
+           \code
+           falsehoods = NOTYET
+           \endcode
+
+           See also \l defines.
+
+    \row
+        \o \bold generateindex \target generateindex
+        \o \bold{The \c generateindex variable contains a boolean value that
+           specifies whether to generate an index file when HTML documentation
+           is generated.}
+
+           By default, an index file is always generated with HTML documentation,
+           so this variable is typically only used when disabling this feature
+           (by setting the value to \c false) or when enabling index generation
+           for the WebXML output (by setting the value to \c true).
+    \row
+        \o \bold headerdirs \target headerdirs
+        \o \bold {The \c headerdirs variable specifies the directories
+           containing the header files associated with the \c .cpp source
+           files used in the documentation.}
+
+           For example:
+
+           \code
+           headerdirs = $QTDIR/src \
+                        $QTDIR/extensions/activeqt \
+                        $QTDIR/extensions/motif \
+                        $QTDIR/tools/designer/src/lib/extension \
+                        $QTDIR/tools/designer/src/lib/sdk \
+                        $QTDIR/tools/designer/src/lib/uilib
+           \endcode
+
+           When executed, the first QDoc will do is to read through
+           the headers specified in the \l {headers}{\c headers}
+           variable, and the ones located in the directories specified
+           in the \c headerdir variable (including all
+           subdirectories), building an internal structure of the
+           classes and their functions.
+
+           Then it will read through the sources specified in the \l
+           {sources}{\c sources}, and the ones located in the
+           directories specified in the \l {sourcedirs}{\c sourcedirs}
+           varible (including all subdirectories), merging the
+           documentation with the structure it retrieved from the
+           header files.
+
+           If both the \c headers and \c headerdirs variables are
+           defined, QDoc will read through both, first \l {headers}{\c
+           headers} then \c headerdirs.
+
+           In the specified directories, QDoc will only read the files
+           with the fileextensions specified in the \l
+           {headers.fileextensions}{\c headers.fileextensions}
+           variable. The default extensions are *.ch, *.h, *.h++,
+           *.hh, *.hpp and *.hxx". The files specified by \l
+           {headers}{\c headers} will be read independent of their
+           fileextensions.
+
+           See also \l headers and \l headers.fileextensions.
+
+    \row
+        \o \bold headers \target headers
+        \o \bold {The \c headers variable allows you to specify individual
+           header files in addition to those located in the directories
+           specified by the \l {headerdirs}{\c headerdirs} variable.}
+
+           For example:
+
+           \code
+           headers = $QTDIR/src/gui/widgets/qlineedit.h \
+                     $QTDIR/src/gui/widgets/qpushbutton.h
+           \endcode
+
+           When processing the \c headers variable, QDoc behaves in the
+           same way as it does when processing the \l {headerdirs}{\c
+           headerdirs} variable. For more information, see the \l
+           {headerdirs}{\c headerdirs} variable.
+
+           See also \l headerdirs.
+
+    \row
+        \o \bold headers.fileextensions \target headers.fileextensions
+        \o \bold {The \c headers.fileextensions variable specify the
+           extension used by the headers.}
+
+           When processing the header files specified in the \l
+           {headerdirs}{\c headerdirs} variable, QDoc will only read
+           the files with the fileextensions specified in the \c
+           headers.fileextensions variable. In this way QDoc avoid
+           spending time reading irrelevant files.
+
+           The default extensions are *.ch, *.h, *.h++, *.hh, *.hpp
+           and *.hxx.
+
+           The extensions are given as standard wildcard expressions.
+           You can add a file extension to the filter using '+='. For
+           example:
+
+           \code
+           header.fileextensions += *.H
+           \endcode
+           
+           \warning The above assignment may not work as described.
+
+           See also \l headerdirs.
+
+    \row
+        \o \bold imagedirs \target imagedirs
+        \o \bold {The \c imagedirs variable specifies the directories
+           containing the images used in the documentation.}
+
+           The \l {images}{\c images} and \c imagedirs variables are
+           used by the \l {image}{\\image} and \l
+           {inlineimage}{\\inlineimage} commands.  If both the \l
+           {images}{\c images} and \c imagedirs variables are defined,
+           QDoc will search in both, first in \l {images}{\c images}
+           then in \c imagedirs.
+
+           QDoc will search through the directories in the specified
+           order, and accept the first matching file it finds. It will
+           only search in the specified directories, \i not in
+           subdirectories.
+
+           For example:
+
+           \code
+           imagedirs = $QTDIR/doc/src/images \
+                       $QTDIR/examples
+
+           images    = $QTDIR/doc/src/images/calculator-example.png
+           \endcode
+
+           When processing
+
+           \code
+               \image calculator-example.png
+           \endcode
+
+           QDoc will then see if there exists a file called
+           calculator-example.png listed as a value in the \c images
+           variable. If it doesn't, it will search in the \c imagedirs
+           variable, and first see if there exists a file called
+
+           \code
+               $QTDIR/doc/src/images/calculator-example.png
+           \endcode
+
+           If it doesn't, QDoc will look for a file called
+
+           \code
+               $QTDIR/examples/calculator-example.png
+           \endcode
+
+           You can filter the images in an image directory using the
+           \l {images.fileextensions}{\c images.fileextensions}
+           variable.  The general idea behind the \l
+           {images.fileextensions}{\c images.fileextensions} variable
+           is to enable different image format for different output
+           format.
+
+           \warning The \l {images.fileextensions}{\c
+           images.fileextensions} variable's functionality is
+           preliminay since QDoc at this point only support HTML.
+
+           See also \l images and \l images.fileextensions.
+
+    \row
+        \o \bold images \target images
+        \o \bold {The \c images variable allows you to specify individual
+           image files in addition to those located in the directories
+           specified by the \l {imagedirs}{\c imagedirs} variable.}
+
+           For example:
+
+           \code
+               images = $QTDIR/doc/src/images/calculator-example.png
+           \endcode
+
+           When processing the \c images variable, QDoc behaves in the
+           same way as it does when processing the \l {imagedirs}{\c
+           imagedirs} variable. For more information, see the \l
+           {imagedirs}{\c imagedirs} variable.
+
+           See also \l imagedirs and \l images.fileextensions.
+
+    \row
+        \o \bold images.fileextensions \target images.fileextensions
+        \o \bold {The images.fileextensions variable filters the files within
+           an image directory.}
+
+           The variable's values (the extensions) are given as
+           standard wildcard expressions.  The general syntax is: \tt
+           {images.fileextensions.\i{format} = *.\i{extension}}.
+
+           The idea is to enable different image format for different
+           output format. For example:
+
+           \code
+               images.fileextensions.HTML = *.png
+               images.fileextensions.LOUT = *.eps
+           \endcode
+
+           Then, when processing the \l {image}{\\image} and \l
+           {inlineimage}{\\inlineimage} commands, QDoc will only
+           search for files with extensions specified in the output
+           format's associated image extension variable.
+
+           \warning This is preliminary functionality since QDoc at
+           this point only support HTML.
+
+           The default extensions for HTML are *.png, *.jpg, *.jpeg
+           and *.gif.
+
+           You can add a file extension to the filter using '+='. For
+           example:
+
+           \code
+               images.fileextensions.HTML += *.eps
+           \endcode
+
+           See also \l imagedirs and \l images.
+
+    \row
+        \o \bold language \target language
+        \o \bold {The \c language variable specifies the language of the
+           source code that is used in the documentation.}
+
+           Currently, C++ is the only language that QDoc
+           understands. It is also the default language, and doesn't
+           really need to be specified. But for example in \l
+           qt.qdocconf:
+
+           \code
+           language = Cpp
+           \endcode
+
+           identifies the language of the Qt source code as C++.
+
+    \row
+        \o \bold macro \target macro
+        \o \bold {The \c macro variable can be used to create your
+           own QDoc commands.}
+
+           The general syntax is \tt {macro.\i{command} =
+           "\i{definition}}". The definition can be described using
+           QDoc syntax. In addition it is possible to provide an HTML
+           definition by appending .HTML to the variable.
+
+           For example in \l qt.qdocconf:
+
+           \code
+           macro.gui              = "\\bold"
+           macro.raisedaster.HTML = "<sup>*</sup>"
+           \endcode
+
+           makes sure that the \\gui command renders its argument using a
+           bold font, and that \\raisedaster renders a '*'.
+
+    \row
+        \o \bold outputdir \target outputdir
+        \o \bold {The \c outputdir variable specifies the directory
+           where QDoc will put the generated documentation.}
+
+           In qt.qdocconf:
+
+           \code
+           outputdir = $QTDIR/doc/html
+           \endcode
+
+           locates the generated Qt reference documentation in
+           $QTDIR/doc/html. For example, the documentation of the
+           QWidget class is located in
+
+           \code
+           $QTDIR/doc/html/qwidget.html
+           \endcode
+
+           The associated images will be put in an \c images subdirectory.
+
+           \warning When running QDoc multiple times using the same output
+           directory, all files from the previous run will be lost.
+
+    \row
+        \o \bold outputformats \target outputformats
+        \o \bold {The \c outputformats variable specifies the format of
+           the generated documentation.}
+
+           Currently, QDoc only supports the HTML format. It is also
+           the default format, and doesn't need to be specified.
+
+    \row
+        \o \bold qhp \target qhp
+        \o \bold{The \c qhp variable is used to define the information to be
+           written out to Qt Help Project (\c{qhp}) files.}
+
+           See the \l{Creating Help Project Files} chapter for information
+           about this process.
+
+    \row
+        \o \bold slow \target slow
+        \o \bold {The \c slow variable specifies whether QDoc should do
+           time-consuming processing, such as syntax highlighting.}
+
+           By default, this setting is false.
+
+           Example:
+
+           \code
+               slow = true
+           \endcode
+
+           Another way to turn on "slowness" is to invoke QDoc with the
+           \c -slow command-line option.
+
+    \row
+        \o \bold sourcedirs \target sourcedirs
+        \o \bold {The \c sourcedirs variable specifies the directories
+           containing the \c .cpp or \c .qdoc files used in
+           the documentation.}
+
+           For example in \l qt.qdocconf
+
+           \code
+           sourcedirs = $QTDIR/src \
+                        $QTDIR/doc/src \
+                        $QTDIR/extensions/activeqt \
+                        $QTDIR/extensions/motif \
+                        $QTDIR/tools/designer/src/lib/extension \
+                        $QTDIR/tools/designer/src/lib/sdk \
+                        $QTDIR/tools/designer/src/lib/uilib
+           \endcode
+
+           When executed, the first QDoc will do is to read through
+           the headers specified in the \l {header}{\c header}
+           variable, and the ones located in the directories specified
+           in the \c headerdir variable (including all
+           subdirectories), building an internal structure of the
+           classes and their functions.
+
+           Then it will read through the sources specified in the \l
+           {sources}{\c sources}, and the ones located in the
+           directories specified in the \l {sourcedirs}{\c sourcedirs}
+           varible (including all subdirectories), merging the
+           documentation with the structure it retrieved from the
+           header files.
+
+           If both the \c sources and \c sourcedirs variables are
+           defined, QDoc will read through both, first \l {sources}{\c
+           sources} then \c sourcedirs.
+
+           In the specified directories, QDoc will only read the files
+           with the fileextensions specified in the \l
+           {sources.fileextensions}{\c sources.fileextensions}
+           variable. The default extensions are *.c++, *.cc, *.cpp and
+           *.cxx. The files specified by \l {sources}{\c sources} will
+           be read independent of their fileextensions.
+
+           See also \l sources and \l sources.fileextensions.
+
+    \row
+        \o \bold sources \target sources
+        \o \bold {The \c sources variable allows you to specify
+           individual source files in addition to those located in the
+           directories specified by the \l {sourcedir}{\c sourcedir}
+           variable.}
+
+           For example:
+
+           \code
+           sources = $QTDIR/src/gui/widgets/qlineedit.cpp \
+                     $QTDIR/src/gui/widgets/qpushbutton.cpp
+           \endcode
+
+           When processing the \c sources variable, QDoc behaves in the
+           same way as it does when processing the \l {sourcedirs}{\c
+           sourcedirs} variable. For more information, see the \l
+           {sourcedirs}{\c sourcedirs} variable.
+
+           See also \l sourcedirs.
+
+    \row
+        \o \bold sources.fileextensions \target sources.fileextensions
+        \o \bold {The \c sources.fileextensions variable filters the
+           files within a source directory.}
+
+           When processing the source files specified in the \l
+           {sourcedirs}{\c sourcedirs} variable, QDoc will only read
+           the files with the fileextensions specified in the \c
+           sources.fileextensions variable. In this way QDoc avoid
+           spending time reading irrelevant files.
+
+           The default extensions are *.c++, *.cc, *.cpp and *.cxx.
+
+           The extensions are given as standard wildcard expressions.
+           You can add a file extension to the filter using '+='. For
+           example:
+
+           \code
+           sources.fileextensions += *.CC
+           \endcode
+
+           \warning The above assignment may not work as described.
+
+           See also \l sourcedirs and \l sources.
+
+    \row
+        \o \bold spurious \target spurious
+        \o \bold {The \c spurious variable excludes specified
+           QDoc warnings from the output.}
+
+           The warnings are specified using standard wildcard
+           expressions. For example:
+
+           \code
+           spurious = "Cannot find .*" \
+                      "Missing .*"
+           \endcode
+
+           makes sure that warnings matching either of these
+           expressions, will not be part of the output when running
+           QDoc. For example would the following warning be omitted
+           from the output:
+
+           \code
+           qt-4.0/src/opengl/qgl_mac.cpp:156: Missing parameter name
+           \endcode
+
+    \row
+        \o \bold tabsize \target tabsize
+        \o \bold {The \c tabsize variable defines the size of a tab
+           character.}
+
+           For example:
+
+           \code
+           tabsize = 4
+           \endcode
+
+           will give the tab character the size of 4 spaces.
+
+           The default value of the variable is 8, and doesn't need to
+           be specified.
+
+    \row
+        \o \bold tagfile \target tagfile
+        \o \bold{The \c tagfile variable specifies the Doxygen tag file to be written
+           when HTML is generated.}
+    \row
+        \o \bold version \target version
+        \o \bold {The \c version variable specifies the version number of the
+           documented software.}
+
+           For example:
+
+           \code
+           version = 4.0.1
+           \endcode
+
+           When a version number is specified (using the \tt{\l
+           version} or \tt {\l versionsym} variables in a \c .qdocconf
+           file), it is accessible through the corresponding \\version
+           command for use in the documentation.
+
+           \warning The \\version command's functionality is not
+           fully implemented; currently it only works within raw HTML
+           code.
+
+           See also \l versionsym.
+
+    \row
+        \o \bold versionsym \target versionsym
+        \o \bold {The \c versionsym variable specifies a C++
+           preprocessor symbol that defines the version number
+           of the documented software.}
+
+           For example in \l qt.qdocconf:
+
+           \code
+           versionsym = QT_VERSION_STR
+           \endcode
+
+           QT_VERSION_STR is defined in qglobal.h as follows
+
+           \code
+           #define QT_VERSION_STR   "4.0.1"
+           \endcode
+
+           When a version number is specified (using the \tt{\l
+           version} or \tt {\l versionsym} variables in a \c .qdocconf
+           file), it is accessible through the corresponding \\version
+           command for use in the documentation.
+
+           \warning The \\version command's functionality is not fully
+           implemented; currently it only works within raw HTML code.
+
+           See also \l {version}{\\version}.
+
+    \endtable
+*/
+
+/*!
+    \page 22-creating-help-project-files.html
+    \previouspage General Variables
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage C++ Specific Variables
+
+    \title Creating Help Project Files
+
+    \section1 Overview
+    
+    Starting with Qt 4.4, Qt Assistant uses a different system for managing
+    Qt documentation that requires QDoc to generate inventories of files in a
+    format that is similar to the old style DCF format, but with additional
+    features.
+
+    Instead of hard-coding information about the documentation sets for Qt,
+    QDoc allows configuration variables to be used to specify which pages are
+    to be used in each documentation set it generates. These are specified as
+    subvariables of the \c qch variable with each set declared using a unique
+    identifier as a subvariable.
+
+    For example, the configuration file for the Qt documentation defines a
+    \c Qt documentation set by specifying information about the set as
+    subvariables with the \c{qhp.Qt} prefix:
+
+    \code
+    qhp.Qt.file                = qt.qhp
+    qhp.Qt.namespace           = com.trolltech.qt.440
+    qhp.Qt.virtualFolder       = qdoc
+    qhp.Qt.indexTitle          = Qt Reference Documentation
+    qhp.Qt.indexRoot           = 
+    qhp.Qt.extraFiles          = classic.css images/qt-logo.png
+    qhp.Qt.filterAttributes    = qt 4.4.0 qtrefdoc
+    qhp.Qt.customFilters.Qt.name = Qt 4.4.0
+    qhp.Qt.customFilters.Qt.filterAttributes = qt 4.4.0
+    qhp.Qt.subprojects         = classes overviews examples
+    qhp.Qt.subprojects.classes.title = Classes
+    qhp.Qt.subprojects.classes.indexTitle = Qt's Classes
+    qhp.Qt.subprojects.classes.selectors = class
+    qhp.Qt.subprojects.overviews.title = Overviews
+    qhp.Qt.subprojects.overviews.indexTitle = All Overviews and HOWTOs
+    qhp.Qt.subprojects.overviews.selectors = fake:page,group,module
+    qhp.Qt.subprojects.examples.title = Tutorials and Examples
+    qhp.Qt.subprojects.examples.indexTitle = Qt Examples
+    qhp.Qt.subprojects.examples.selectors = fake:example
+    \endcode
+*/
+
+/*!
+    \page 23-qdoc-configuration-cppvariables.html
+    \previouspage Creating Help Project Files
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage HTML Specific Variables
+
+    \title C++ Specific Variables
+
+    The C++ specific configuration variables are provided to avoid
+    erroneous documentation due to non-standard C++ constructs.
+
+    \section1 Alphabetical List
+
+    \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoredirectives}
+       {Cpp.ignoredirectives},
+    \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoretoken}
+       {Cpp.ignoretokens}
+
+    \section1 Variable Descriptions
+
+    \table
+
+    \header
+        \o Variable
+        \o Description
+
+    \row
+        \o \bold  Cpp.ignoredirectives \target Cpp.ignoredirectives
+        \o \bold {The \c Cpp.ignoredirectives variable makes QDoc ignore
+           the specified non-standard constructs, within C++ source code.}
+
+           If not specified by the \tt {\l Cpp.ignoretokens} or \tt
+           {\l Cpp.ignoredirectives} variables, non-standard
+           constructs (typically macros) can result in erroneous
+           documentation.
+
+           In \l qt.qdocconf:
+
+           \code
+           Cpp.ignoredirectives = Q_DECLARE_INTERFACE \
+                                  Q_DECLARE_OPERATORS_FOR_FLAGS \
+                                  Q_DECLARE_PRIVATE \
+                                  Q_DECLARE_PUBLIC \
+                                  Q_DISABLE_COPY \
+                                  Q_DUMMY_COMPARISON_OPERATOR \
+                                  Q_ENUMS \
+                                  Q_FLAGS \
+                                  Q_INTERFACES \
+                                  __attribute__
+           \endcode
+
+           makes sure that when processing the code below, for
+           example, QDoc will simply ignore the 'Q_ENUMS' and
+           'Q_FLAGS' expressions:
+
+           \code
+               class Q_CORE_EXPORT Qt {
+                   Q_OBJECT
+                   Q_ENUMS(Orientation TextFormat BackgroundMode
+                           DateFormat ScrollBarPolicy FocusPolicy
+                           ContextMenuPolicy CaseSensitivity
+                           LayoutDirection ArrowType)
+                   Q_ENUMS(ToolButtonStyle)
+                   Q_FLAGS(Alignment)
+                   Q_FLAGS(Orientations)
+                   Q_FLAGS(DockWidgetAreas)
+
+               public:
+                   ...
+           };
+           \endcode
+
+           The Q_OBJECT macro, however, is an exception: QDoc
+           recognizes this particular non-standard construct, so there
+           is no need specifying it using the \tt {\l
+           Cpp.ignoredirectives} variable.
+
+           Regarding the Q_CORE_EXPORT macro; see the documentation of
+           the \tt {\l Cpp.ignoretokens} variable.
+
+           See also \l Cpp.ignoretokens.
+
+    \row
+        \o \bold  Cpp.ignoretokens \target Cpp.ignoretokens
+        \o \bold {The \c Cpp.ignoretokens variable makes QDoc ignore
+           the specified non-standard constructs, within C++ source code.}
+
+           If not specified by the \tt {\l Cpp.ignoretokens} or \tt
+           {\l Cpp.ignoredirectives} variables, non-standard
+           constructs (typically macros) can result in erroneous
+           documentation.
+
+           In \l qt.qdocconf:
+
+           \code
+           Cpp.ignoretokens = QAXFACTORY_EXPORT \
+                              QM_EXPORT_CANVAS \
+                              ...
+                              Q_COMPAT_EXPORT \
+                              Q_CORE_EXPORT \
+                              Q_EXPLICIT \
+                              Q_EXPORT \
+                              ...
+                              Q_TYPENAME        \
+                              Q_XML_EXPORT
+           \endcode
+
+           makes sure that when processing the code below, for
+           example, QDoc will simply ignore the 'Q_CORE_EXPORT'
+           expression:
+
+           \code
+               class Q_CORE_EXPORT Qt {
+                   Q_OBJECT
+                   Q_ENUMS(Orientation TextFormat BackgroundMode
+                           DateFormat ScrollBarPolicy FocusPolicy
+                           ContextMenuPolicy CaseSensitivity
+                           LayoutDirection ArrowType)
+                   Q_ENUMS(ToolButtonStyle)
+                   Q_FLAGS(Alignment)
+                   Q_FLAGS(Orientations)
+                   Q_FLAGS(DockWidgetAreas)
+
+               public:
+                   ...
+           };
+           \endcode
+
+           Regarding the Q_OBJECT, Q_ENUMS and Q_FLAGS macros; see the
+           documentation of the \tt {\l Cpp.ignoredirectives}
+           variable.
+
+           See also \l Cpp.ignoredirectives.
+
+    \endtable
+*/
+
+
+/*!
+    \page 24-qdoc-configuration-htmlvariables.html
+    \previouspage C++ Specific Variables
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage Supporting Derived Projects
+
+    \title HTML Specific Variables
+
+    The HTML specific configuration variables define the generated
+    documentation's style, or define the contents of the
+    documentation's footer or postheader. The format of the variable
+    values are raw HTML.
+
+    \section1 Alphabetical List
+
+    \l {24-qdoc-configuration-htmlvariables.html#HTML.footer}{HTML.footer},
+    \l {24-qdoc-configuration-htmlvariables.html#HTML.postheader}
+       {HTML.postheader},
+    \l {24-qdoc-configuration-htmlvariables.html#HTML.style}{HTML.style},
+    \l {24-qdoc-configuration-htmlvariables.html#HTML.stylesheets}{HTML.stylesheets}
+
+
+    \section1 Variable Descriptions
+
+    \table
+
+    \header
+        \o Variable
+        \o Description
+
+    \row
+        \o \bold HTML.footer \target HTML.footer
+        \o \bold {The \c HTML.footer variable defines the content
+           of the generated HTML documentation's footer.}
+
+           The footer is rendered at the bottom of the generated
+           documentation page.
+
+           The variable's value is given as raw HTML code enclosed by
+           quotation marks. Note that if the value spans several
+           lines, each line needs to be enclosed by quotation marks.
+
+           For example in \l qt.qdocconf:
+
+           \code
+               HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
+                             ...
+                             "</tr></table></div></address>"
+           \endcode
+
+           The complete variable entry in \l qt.qdocconf provides the
+           standard footer of the \l
+           {http://qt.nokia.com/doc/4.0/index.html}{Qt Reference
+           Documentation}.
+
+    \row
+        \o \bold HTML.postheader \target HTML.postheader
+        \o \bold {The \c HTML.postheader variable defines the content
+           of the generated HTML documentation's postheader.}
+
+           The header is rendered at the top of the generated
+           documentation page.
+
+           The variable's value is given as raw HTML enclosed by
+           quotation marks. Note that if the value spans several
+           lines, each line needs to be enclosed by quotation marks.
+
+           For example in \l qt.qdocconf:
+
+           \code
+            HTML.postheader = "<table border=\"0\"..." \
+                              ...
+                              "<img src=\"images/trolltech-logo.png\" \
+                              "align=\"right\" width=\"203\" height=\"32\""\
+                              "border=\"0\" />" \
+                              "</td></tr>" \
+                              "</table>"
+           \endcode
+
+           The complete variable entry in \l qt.qdocconf provides the
+           standard header of the \l
+           {http://qt.nokia.com/doc/4.0/index.html}{Qt Reference
+           Documentation}.
+
+    \row
+        \o \bold HTML.style \target HTML.style
+        \o \bold {The HTML.style variable defines the style for
+           the generated HTML documentation.}
+
+           The variable's value is given as raw HTML enclosed by
+           quotation marks. Note that if the value spans several
+           lines, each line needs to be enclosed by quotation marks.
+
+           For example in \l qt.qdocconf:
+
+           \code
+           HTML.style = "h3.fn,span.fn" \
+                        "{ margin-left: 1cm; text-indent: -1cm; }\n" \
+                        "a:link { color: #004faf; text-decoration: none }\n" \
+                        "a:visited" \
+                        "{ color: #672967; text-decoration: none }\n" \
+                        "td.postheader { font-family: sans-serif }\n" \
+                        "tr.address { font-family: sans-serif }\n" \
+                        "body { background: #ffffff; color: black; }"
+           \endcode
+
+           provides the HTML style for the \l
+           {http://qt.nokia.com/doc/4.0/index.html}{Qt Reference
+           Documentation}.
+
+    \row
+        \o \bold HTML.stylesheets \target HTML.stylesheets
+        \o \bold {The HTML.stylesheets variable defines a list of stylesheets
+           to use for the generated HTML documentation.}
+
+           Using separate stylesheets for the documentation makes it easier to
+           customize and experiment with the style used once the contents has
+           been generated. Typically, it is only necessary to define a single
+           stylesheet for any set of documentation; for example:
+
+           \code
+           HTML.stylesheets = classic.css
+           \endcode
+
+           QDoc expects to find stylesheets in the directory containing the
+           \l qt.qdocconf file, and it will copy those specified to the output
+           directory alongside the HTML pages.
+    \endtable
+*/
+
+/*!
+    \page 25-qdoc-configuration-derivedprojects.html
+    \previouspage HTML Specific Variables
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage QDoc Compatibility
+
+    \title Supporting Derived Projects
+
+    \tableofcontents
+
+    Some particular configuration variables allow you to use QDoc to
+    support Qt-based projects; i.e to make projects, such as Qt Solutions,
+    contain references to the online Qt documentation. This
+    means that QDoc will be able to create links to the class reference
+    documentation, without any explicit linking command.
+
+    \section1 The Configuration Variables
+
+    \section2 Alphabetical List
+
+    \l{25-qdoc-configuration-derivedprojects.html#description}{description},
+    \l{25-qdoc-configuration-derivedprojects.html#indexes}{indexes},
+    \l{25-qdoc-configuration-derivedprojects.html#project}{project},
+    \l{25-qdoc-configuration-derivedprojects.html#url}{url}
+
+    \section2 Variable Descriptions
+
+    \table
+    \header
+        \o Variable
+        \o Description
+    \row
+        \o \bold description \target description
+        \o \bold {The description variable holds a short description of
+           the associated project.}
+
+           See also \l project.
+
+    \row
+        \o \bold indexes \target indexes
+        \o \bold {The \c indexes variable lists the index files
+           that will be used to generate references.}
+
+           For example. to make a derived Qt project contain links to
+           the Qt Reference documentation, you need to specify the
+           associated index file:
+
+           \code
+               indexes = $QTDIR/doc/html/qt.index
+           \endcode
+
+           See also \l project and \l url.
+
+    \row
+        \o \bold project \target project
+        \o \bold {The \c project variable provides a name for the project
+           associated with the \c .qdocconf file.}
+
+           The project's name is used to form a file name for the
+           associated project's \i index file. For example:
+
+           \code
+               project = QtMotif
+           \endcode
+
+           This will cause an index file called \c qtmotif.index to be
+           created.
+
+           See also \l description and \l indexes.
+    \row
+        \o \bold url \target url
+        \o \bold {The \c url variable holds the base URL for the
+            reference documentation associated with the current project.}
+
+            The URL is stored in the generated index file for the
+            project. When we use the index on its own, QDoc will use
+            this as the base URL when constructing links to classes,
+            functions, and other things listed in the index.
+
+            For example:
+
+            \code
+                 project     = Qt
+                 description = Qt Reference Documentation
+                 url         = http://qt.nokia.com/doc/4.0
+
+                 ...
+            \endcode
+
+            This makes sure that whenever \c qt.index is used to generate
+            references to for example Qt classes, the base URL is
+            \c http://qt.nokia.com/doc/4.0.
+
+            See also \l indexes.
+
+    \endtable
+
+    \target howto
+    \section1 How to Support Derived Projects
+
+    This feature makes use of the comprehensive indexes generated by
+    QDoc when it creates the Qt reference documentation.
+
+    For example, \l qt.qdocconf (the configuration file for Qt)
+    contains the following variable definitions:
+
+    \code
+        project     = Qt
+        description = Qt Reference Documentation
+        url         = http://qt.nokia.com/doc/4.0
+
+        ...
+    \endcode
+
+    The \l project variable name is used to form a file name for the
+    index file; in this case the \c qt.index file is created.  The \l
+    url is stored in the index file. Later, when we use the index on
+    its own, QDoc will use this as the base URL when constructing
+    links to classes, functions, and other things listed in the index.
+
+    In a mini-project, you can use an index file by defining an \l
+    indexes configuration variable in your \c .qdocconf file.
+
+    For example, you can create a \c qtmotif.qdocconf file to help you
+    check the QtMotif documentation (which is part of Qt Solutions):
+
+    \code
+        include($QTDIR/tools/qdoc3/test/compat.qdocconf)
+
+        project                 = QtMotif
+        description             = QtMotif Class Documentation
+        url                     = http://www.trolltech.com/products/solutions/catalog/4/Migration/qtmotifextension
+
+        indexes                 = $QTDIR/doc/html/qt.index
+
+        outputdir               = html
+
+        headerdirs              = src
+        sourcedirs              = src \
+                                  examples
+        sources.fileextensions  = "*.cpp *.qdoc *.doc"
+
+        exampledirs = examples
+    \endcode
+
+    The code above requires that you run QDoc from the directory that
+    contains this file. You need to include the compat.qdocconf
+    file for compatibility reasons; this is further explained in the
+    \l {QDoc Compatibility} section.
+
+    \bold {To resolve the actual links to Qt classes, the
+    mini-project's \c .qdocconf file needs to assign a value to the \l
+    indexes variable; \c $QTDIR/doc/html/qt.index makes sure that you
+    always use the updated index file for the Qt documentation.}
+
+    The only disadvantages with this approach are the extra file that
+    QDoc has to generate and the time it takes to do so. Reading the
+    index back again later isn't instantaneous either, but it's
+    quicker than processing all the Qt classes each time you need to
+    write a new document.
+*/
+
+/*!
+    \page 26-qdoc-commands-compatibility.html
+    \previouspage Supporting Derived Projects
+    \contentspage QDoc Manual - Table of Contents
+    \nextpage QDoc Commands - Alphabetical List
+
+    \title QDoc Compatibility
+
+    \tableofcontents
+
+    \section1 General Description
+
+    \target reason
+
+    QDoc is a tool that constantly evolves to suit our needs, for that
+    reason there are some compatibility issues in the transition
+    between old and new practices.
+
+    To make the transition as smooth and rapid as possible, the
+    general idea is to adopt the new commands and usage in new
+    documentation.  While waiting for the occurrences of the old
+    practices to be eliminated from the old parts of the
+    documentation, you can map the new commands and usage to the old
+    ones using a compat.qdocconf file.
+
+    A compat.qdocconf file is a separate \c .qdocconf file which you
+    can include in your main configuration file. It typically contains
+    the mapping between old and new commands using the \l alias and \l
+    {22-qdoc-configuration-generalvariables.html#macro}{macro}
+    configuration variables.
+
+    \section1 Qt Compatibility
+
+    In Qt's documentation there still exist occurrences of old
+    commands, and the Qt \l {qt.qdocconf}{configuration file} needs to
+    include the compat.qdocconf file tailored for Qt. For more
+    detailed information about the commands creating compatibility
+    issues, see the \l {Command Comments}{command comments}.
+
+    \section2 Qt's current compat.qdocconf file
+
+    \quotefile files/compat.qdocconf
+
+    \section2 Command Comments
+
+    \table
+    \header
+        \o New Command
+        \o Old Command
+        \o Description
+
+    \row
+        \o \\i \target i-versus-e
+        \o \\e
+        \o Earlier we
+           used the \\i command to indicate a list or table item, and
+           the \\e command for rendering in italic. Now we want the
+           \\i command to render in italic discarding the
+           \\e command name.
+
+           \bold {We still need to use the \\e command to render in
+           italic in new documentation for \l {reason}{compatibility
+           reasons}}.
+
+    \row
+        \o \\include \target include-versus-input
+        \o \\input
+        \o The \\include command was previously used to quote the
+           complete contents of a source file, now we want to use the
+           command to include separate documentation.
+           That is the functionality of the old \\input command
+           which name we want to discard.
+
+           \bold {We still need to use the \\input command to include
+           plain text in new documentation for \l
+           {reason}{compatibility reasons}}.
+
+    \row
+        \o \\quotefile \target quotefile-versus-include
+        \o \\include
+        \o Earlier, we have used the \\quotefile command to
+           quote from file, i.e. quote parts from file, and the
+           \\include command to quote the entire file. Since we now want
+           \\include to include separate documentation, we change the use of
+           \\quotefile to quote a complete source file.
+
+           \bold {We still need to use the \\include command to quote
+           the entire contents of a source file in new documentation
+           for \l {reason}{compatibility reasons}}.
+
+    \row
+        \o \\quotefromfile \target quotefromfile-versus-quotefile
+        \o \\quotefile
+        \o Earlier, we have used the \\quotefile command to
+           quote from file, i.e. quote parts from file. Since we now want
+           that command to quote an entire file, we introduce the new
+           \\quotefromfile command to quote from file.
+
+           \bold {Use \l {quotefromfile}{\\quotefromfile} to quote
+           parts from a source file in new documentation}.
+
+    \row
+        \o \\o \target o-versus-i
+        \o \\i
+        \o Earlier we used the \\i command to indicate list items
+           and table items. Since we now want the \\i command to render
+           in italic instead, we introduce the new \\o command for
+           this purpose.
+
+           \bold {Use \l {o}{\\o} to indicate list and table items in
+           new documentation}.
+
+    \row
+        \o \\quotation \target quotation-versus-quote
+        \o \\quote
+        \o These commands are equivalent, and represent a simple name
+          change.
+
+          \bold {Use \l {quotation}{\\quotation} in new
+          documentation}.
+
+    \row
+        \o \\image \target image-versus-img
+        \o \\img
+        \o These commands are equivalent, and represent a simple name
+           change.
+
+           \bold {Use \l {image}{\\image} in new documentation}.
+
+    \endtable
+*/
+
+/*!
+    \page 27-qdoc-commmands-alphabetical.html
+    \previouspage QDoc Compatibility
+    \contentspage QDoc Manual - Table of Contents
+
+    \title QDoc Commands - Alphabetical List
+
+    \list
+
+    \o \l {04-qdoc-commands-textformatting.html#a}{\\a}
+    \o \l {11-qdoc-commands-documentcontents.html#abstract}{\\abstract}
+    \o \l {06-qdoc-commands-verbatimcode.html#badcode}{\\badcode}
+    \o \l {04-qdoc-commands-textformatting.html#bold}{\\bold}
+    \o \l {11-qdoc-commands-documentcontents.html#brief}{\\brief}
+    \o \l {04-qdoc-commands-textformatting.html#c}{\\c}
+    \o \l {09-qdoc-commands-graphic.html#caption}{\\caption}
+    \o \l {05-qdoc-commands-documentstructuring.html#chapter}{\\chapter}
+    \o \l {13-qdoc-commands-topical.html#class}{\\class}
+    \o \l {06-qdoc-commands-verbatimcode.html#code}{\\code}
+    \o \l {07-0-qdoc-commands-quoting.html#codeline}{\\codeline},
+    \o \l {16-qdoc-commands-status.html#compat}{\\compat}
+    \o \l {15-qdoc-commands-navigation.html#contentspage}{\\contentspage}
+    \o \l {07-0-qdoc-commands-quoting.html#dots}{\\dots}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#else}{\\else}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#endif}{\\endif}
+    \o \l {13-qdoc-commands-topical.html#enum}{\\enum}
+    \o \l {13-qdoc-commands-topical.html#example-command}{\\example}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#expire}{\\expire}
+    \o \l {13-qdoc-commands-topical.html#externalpage}{\\externalpage}
+    \o \l {13-qdoc-commands-topical.html#fn}{\\fn}
+    \o \l {11-qdoc-commands-documentcontents.html#footnote}{\\footnote}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#generatelist}{\\generatelist}
+    \o \l {13-qdoc-commands-topical.html#group}{\\group}
+    \o \l {10-qdoc-commands-container.html#header}{\\header}
+    \o \l {13-qdoc-commands-topical.html#headerfile}{\\headerfile}
+    \o \l {04-qdoc-commands-textformatting.html#i}{\\i}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#if}{\\if}
+    \o \l {09-qdoc-commands-graphic.html#image}{\\image}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#include}{\\include}
+    \o \l {15-qdoc-commands-navigation.html#indexpage}{\\indexpage}
+    \o \l {19-qdoc-commands-grouping.html#ingroup}{\\ingroup}
+    \o \l {19-qdoc-commands-grouping.html#inmodule}{\\inmodule}
+    \o \l {09-qdoc-commands-graphic.html#inlineimage}{\\inlineimage}
+    \o \l {16-qdoc-commands-status.html#internal}{\\internal}
+    \o \l {08-qdoc-commands-linking.html#keyword}{\\keyword}
+    \o \l {08-qdoc-commands-linking.html#l}{\\l}
+    \o \l {11-qdoc-commands-documentcontents.html#legalese}{\\legalese}
+    \o \l {10-qdoc-commands-container.html#list}{\\list}
+    \o \l {13-qdoc-commands-topical.html#macro}{\\macro}
+    \o \l {19-qdoc-commands-grouping.html#mainclass}{\\mainclass}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#meta}{\\meta}
+    \o \l {13-qdoc-commands-topical.html#module}{\\module}
+    \o \l {13-qdoc-commands-topical.html#namespace}{\\namespace}
+    \o \l {15-qdoc-commands-navigation.html#nextpage}{\\nextpage}
+    \o \l {06-qdoc-commands-verbatimcode.html#newcode}{\\newcode}
+    \o \l {17-qdoc-commands-thread.html#nonreentrant}{\\nonreentrant}
+    \o \l {10-qdoc-commands-container.html#o}{\\o}
+    \o \l {16-qdoc-commands-status.html#obsolete}{\\obsolete}
+    \o \l {06-qdoc-commands-verbatimcode.html#oldcode}{\\oldcode}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#omit}{\\omit}
+    \o \l {10-qdoc-commands-container.html#omitvalue}{\\omitvalue}
+    \o \l {18-qdoc-commands-relating.html#overload}{\\overload}
+    \o \l {13-qdoc-commands-topical.html#page}{\\page}
+    \o \l {05-qdoc-commands-documentstructuring.html#part}{\\part}
+    \o \l {16-qdoc-commands-status.html#preliminary}{\\preliminary}
+    \o \l {15-qdoc-commands-navigation.html#previouspage}{\\previouspage}
+    \o \l {07-0-qdoc-commands-quoting.html#printline}{\\printline}
+    \o \l {07-0-qdoc-commands-quoting.html#printto}{\\printto}
+    \o \l {07-0-qdoc-commands-quoting.html#printuntil}{\\printuntil}
+    \o \l {13-qdoc-commands-topical.html#property}{\\property}
+    \o \l {11-qdoc-commands-documentcontents.html#quotation}{\\quotation}
+    \o \l {07-0-qdoc-commands-quoting.html#quotefile}{\\quotefile}
+    \o \l {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\raw}
+    \o \l {17-qdoc-commands-thread.html#reentrant}{\\reentrant}
+    \o \l {18-qdoc-commands-relating.html#reimp}{\\reimp}
+    \o \l {18-qdoc-commands-relating.html#relates}{\\relates}
+    \o \l {10-qdoc-commands-container.html#row}{\\row}
+    \o \l {08-qdoc-commands-linking.html#sa}{\\sa}
+    \o \l {05-qdoc-commands-documentstructuring.html#sectionOne}{\\section1}
+    \o \l {05-qdoc-commands-documentstructuring.html#sectionTwo}{\\section2}
+    \o \l {05-qdoc-commands-documentstructuring.html#sectionThree}{\\section3}
+    \o \l {05-qdoc-commands-documentstructuring.html#sectionFour}{\\section4}
+    \o \l {13-qdoc-commands-topical.html#service}{\\service}
+    \o \l {16-qdoc-commands-status.html#since}{\\since}
+    \o \l {07-0-qdoc-commands-quoting.html#skipline}{\\skipline}
+    \o \l {07-0-qdoc-commands-quoting.html#skipto}{\\skipto}
+    \o \l {07-0-qdoc-commands-quoting.html#skipuntil}{\\skipuntil}
+    \o \l {07-0-qdoc-commands-quoting.html#snippet}{\\snippet},
+    \o \l {15-qdoc-commands-navigation.html#startpage}{\\startpage}
+    \o \l {04-qdoc-commands-textformatting.html#sub}{\\sub}
+    \o \l {20-qdoc-commands-title.html#subtitle}{\\subtitle}
+    \o \l {04-qdoc-commands-textformatting.html#sup}{\\sup}
+    \o \l {10-qdoc-commands-container.html#table}{\\table}
+    \o \l {11-qdoc-commands-documentcontents.html#tableofcontents}
+          {\\tableofcontents}
+    \o \l {08-qdoc-commands-linking.html#target}{\\target}
+    \o \l {17-qdoc-commands-thread.html#threadsafe}{\\threadsafe}
+    \o \l {20-qdoc-commands-title.html#title}{\\title}
+    \o \l {04-qdoc-commands-textformatting.html#tt}{\\tt}
+    \o \l {13-qdoc-commands-topical.html#typedef}{\\typedef}
+    \o \l {04-qdoc-commands-textformatting.html#underline}{\\underline}
+    \o \l {13-qdoc-commands-topical.html#variable}{\\variable}
+    \o \l {10-qdoc-commands-container.html#value}{\\value}
+    \o \l {11-qdoc-commands-documentcontents.html#warning}{\\warning}
+    \endlist
+*/
+
+/*!
+    \externalpage http://qt.nokia.com/about
+    \title About Qt
+*/
diff --git a/tools/qdoc3/doc/qdoc-manual.qdocconf b/tools/qdoc3/doc/qdoc-manual.qdocconf
new file mode 100644
index 0000000..26fd09c
--- /dev/null
+++ b/tools/qdoc3/doc/qdoc-manual.qdocconf
@@ -0,0 +1,49 @@
+project          = QDoc
+description      = QDoc3 Manual
+
+indexes          = $QTDIR/doc/html/qt.index
+
+outputdir        = html
+
+sources          = qdoc-manual.qdoc
+sourcedirs       = $PWD
+
+exampledirs     += $PWD \
+                   $QTDIR/examples
+
+imagedirs       += images
+
+extraimages.HTML = qt-logo
+
+HTML.stylesheets = classic.css
+
+HTML.style       = "h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }\n" \
+                   "a:link { color: #004faf; text-decoration: none }\n" \
+                   "a:visited { color: #672967; text-decoration: none }\n" \
+                   "td.postheader { font-family: sans-serif }\n" \
+                   "tr.address { font-family: sans-serif }\n" \
+                   "body { background: #ffffff; color: black; }"
+
+HTML.postheader  = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"5\" width=\"100%\">\n" \
+                   "<tr>\n" \
+                   "<td align=\"left\" valign=\"top\" width=\"32\">" \
+                   "<a href=\"http://qt.nokia.com/\"><img src=\"images/qt-logo.png\" align=\"left\" border=\"0\" /></a>" \
+                   "</td>\n" \
+                   "<td class=\"postheader\" valign=\"center\">" \
+                   "<a href=\"01-qdoc-manual.html\">" \
+                   "<font color=\"#004faf\">Home: QDoc Manual</font></a>&nbsp;&middot;" \
+                   "<a href=\"http://qt.nokia.com/doc/4.7\">" \
+                   "<font color=\"#004faf\"> Qt Reference Documentation</font></a>" \
+                   "</td>\n" \
+                   "</tr></table>"
+
+HTML.footer     = "<p /><address><hr /><div align=\"center\">\n" \
+                  "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
+                  "<td width=\"40%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
+                  "<td width=\"20%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
+                  "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \
+                  "</tr></table></div></address>"
+
+spurious        += "Missing '\\}'" 
+spurious        += "Cannot use .*"
+spurious        += "Unexpected .*"
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 15386f1..e341a03 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -54,10 +54,12 @@
 #include <qdebug.h>
 #include <qlist.h>
 #include <qiterator.h>
+#include <qtextcodec.h>
 
 QT_BEGIN_NAMESPACE
 
 #define COMMAND_VERSION                 Doc::alias("version")
+int HtmlGenerator::id = 0;
 
 QString HtmlGenerator::sinceTitles[] =
     {
@@ -266,6 +268,15 @@ void HtmlGenerator::initializeGenerator(const Config &config)
 
     projectUrl = config.getString(CONFIG_URL);
 
+    outputEncoding = config.getString(CONFIG_OUTPUTENCODING);
+    if (outputEncoding.isEmpty())
+        outputEncoding = QLatin1String("ISO-8859-1");
+    outputCodec = QTextCodec::codecForName(outputEncoding.toLocal8Bit());
+
+    naturalLanguage = config.getString(CONFIG_NATURALLANGUAGE);
+    if (naturalLanguage.isEmpty())
+        naturalLanguage = QLatin1String("en");
+
     QSet<QString> editionNames = config.subVars(CONFIG_EDITION);
     QSet<QString>::ConstIterator edition = editionNames.begin();
     while (edition != editionNames.end()) {
@@ -389,9 +400,9 @@ void HtmlGenerator::generateTree(const Tree *tree, CodeMarker *marker)
                 "qmake Manual",
                 dcfQmakeRoot);
 
-    generateIndex(project.toLower().simplified().replace(" ", "-"),
-                  projectUrl,
-                  projectDescription);
+    QString fileBase = project.toLower().simplified().replace(" ", "-");
+    generateIndex(fileBase, projectUrl, projectDescription);
+    generatePageIndex(outputDir() + "/" + fileBase + ".pageindex", marker);
 
     helpProjectWriter->generate(myTree);
 }
@@ -431,11 +442,11 @@ int HtmlGenerator::generateAtom(const Atom *atom,
                 endLink();
             }
             else {
-                out() << protect(atom->string());
+                out() << protectEnc(atom->string());
             }
         }
         else {
-            out() << protect(atom->string());
+            out() << protectEnc(atom->string());
         }
         break;
     case Atom::BaseName:
@@ -483,7 +494,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
     case Atom::C:
         out() << formattingLeftMap()[ATOM_FORMATTING_TELETYPE];
         if (inLink) {
-            out() << protect(plainCode(atom->string()));
+            out() << protectEnc(plainCode(atom->string()));
         }
         else {
             out() << highlightedCode(atom->string(), marker, relative);
@@ -516,7 +527,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         // fallthrough
     case Atom::CodeBad:
         out() << "<pre><font color=\"#404040\">"
-              << trimmedTrailing(protect(plainCode(indent(codeIndent,atom->string()))))
+              << trimmedTrailing(protectEnc(plainCode(indent(codeIndent,atom->string()))))
               << "</font></pre>\n";
 	break;
     case Atom::FootnoteLeft:
@@ -768,7 +779,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
                         out() << "<a name=\""
                               << Doc::canonicalTitle((*s).name)
                               << "\"></a>\n";
-                        out() << "<h3>" << protect((*s).name) << "</h3>\n";
+                        out() << "<h3>" << protectEnc((*s).name) << "</h3>\n";
                         if (idx == Class)
                             generateCompactList(0, marker, ncmap.value(), QString("Q"));
                         else if (idx == MemberFunction) {
@@ -792,7 +803,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
                                       << linkForNode(pmap.key(), 0)
                                       << "\">";
                                 QStringList pieces = fullName(pmap.key(), 0, marker).split("::");
-                                out() << protect(pieces.last());
+                                out() << protectEnc(pieces.last());
                                 out() << "</a>"  << ":</p>\n";
 
                                 generateSection(nlist, 0, marker, CodeMarker::Summary);
@@ -820,12 +831,12 @@ int HtmlGenerator::generateAtom(const Atom *atom,
                 out() << "<p align=\"center\">";
             if (fileName.isEmpty()) {
                 out() << "<font color=\"red\">[Missing image "
-                      << protect(atom->string()) << "]</font>";
+                      << protectEnc(atom->string()) << "]</font>";
             }
             else {
-                out() << "<img src=\"" << protect(fileName) << "\"";
+                out() << "<img src=\"" << protectEnc(fileName) << "\"";
                 if (!text.isEmpty())
-                    out() << " alt=\"" << protect(text) << "\"";
+                    out() << " alt=\"" << protectEnc(text) << "\"";
                 out() << " />";
                 helpProjectWriter->addExtraFile(fileName);
             }
@@ -923,7 +934,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             // ### Trenton
 
             out() << "<tr><td valign=\"top\"><tt>"
-                  << protect(plainCode(marker->markedUpEnumValue(atom->next()->string(),
+                  << protectEnc(plainCode(marker->markedUpEnumValue(atom->next()->string(),
                                                                  relative)))
                   << "</tt></td><td align=\"center\" valign=\"top\">";
 
@@ -936,7 +947,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             if (itemValue.isEmpty())
                 out() << "?";
             else
-                out() << "<tt>" << protect(itemValue) << "</tt>";
+                out() << "<tt>" << protectEnc(itemValue) << "</tt>";
 
             skipAhead = 1;
         }
@@ -1052,7 +1063,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             generateLink(atom, relative, marker);
         }
         else {
-            out() << protect(atom->string());
+            out() << protectEnc(atom->string());
         }
         break;
     case Atom::TableLeft:
@@ -1166,7 +1177,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         out() << "<font color=\"red\"><b>&lt;Missing HTML&gt;</b></font>";
         break;
     case Atom::UnknownCommand:
-        out() << "<font color=\"red\"><b><code>\\" << protect(atom->string())
+        out() << "<font color=\"red\"><b><code>\\" << protectEnc(atom->string())
               << "</code></b></font>";
         break;
 #ifdef QDOC_QML
@@ -1295,7 +1306,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
                 out() << "<a name=\""
                       << registerRef((*s).name.toLower())
                       << "\"></a>\n";
-                out() << "<h2>" << protect((*s).name) << "</h2>\n";
+                out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
                 generateSection(s->members, inner, marker, CodeMarker::Summary);
             }
             if (!s->reimpMembers.isEmpty()) {
@@ -1304,7 +1315,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
                 out() << "<a name=\""
                       << registerRef(name.toLower())
                       << "\"></a>\n";
-                out() << "<h2>" << protect(name) << "</h2>\n";
+                out() << "<h2>" << protectEnc(name) << "</h2>\n";
                 generateSection(s->reimpMembers, inner, marker, CodeMarker::Summary);
             }
 
@@ -1343,7 +1354,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
     s = sections.begin();
     while (s != sections.end()) {
         out() << "<hr />\n";
-        out() << "<h2>" << protect((*s).name) << "</h2>\n";
+        out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
 
         NodeList::ConstIterator m = (*s).members.begin();
         while (m != (*s).members.end()) {
@@ -1518,7 +1529,7 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
         s = sections.begin();
         while (s != sections.end()) {
             out() << "<a name=\"" << registerRef((*s).name) << "\"></a>\n";
-            out() << "<h2>" << protect((*s).name) << "</h2>\n";
+            out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
             generateQmlSummary(*s,fake,marker);
             ++s;
         }
@@ -1534,7 +1545,7 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
         sections = marker->qmlSections(qml_cn,CodeMarker::Detailed);
         s = sections.begin();
         while (s != sections.end()) {
-            out() << "<h2>" << protect((*s).name) << "</h2>\n";
+            out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
             NodeList::ConstIterator m = (*s).members.begin();
             while (m != (*s).members.end()) {
                 generateDetailedQmlMember(*m, fake, marker);
@@ -1554,7 +1565,7 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
     s = sections.begin();
     while (s != sections.end()) {
         out() << "<a name=\"" << registerRef((*s).name) << "\"></a>\n";
-        out() << "<h2>" << protect((*s).name) << "</h2>\n";
+        out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
         generateSectionList(*s, fake, marker, CodeMarker::Summary);
         ++s;
     }
@@ -1583,7 +1594,7 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
     s = sections.begin();
     while (s != sections.end()) {
         out() << "<hr />\n";
-        out() << "<h2>" << protect((*s).name) << "</h2>\n";
+        out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
 
         NodeList::ConstIterator m = (*s).members.begin();
         while (m != (*s).members.end()) {
@@ -1619,7 +1630,7 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
     }
 }
 
-QString HtmlGenerator::fileExtension(const Node * /* node */)
+QString HtmlGenerator::fileExtension(const Node * /* node */) const
 {
     return "html";
 }
@@ -1629,11 +1640,11 @@ void HtmlGenerator::generateHeader(const QString& title,
                                    CodeMarker *marker,
                                    bool mainPage)
 {
-    out() << "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n";
+    out() << QString("<?xml version=\"1.0\" encoding=\"%1\"?>\n").arg(outputEncoding);
 
     out() << "<!DOCTYPE html\n"
-             "    PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"DTD/xhtml1-strict.dtd\">\n"
-             "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n";
+             "    PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"DTD/xhtml1-strict.dtd\">\n";
+    out() << QString("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"%1\" lang=\"%1\">\n").arg(naturalLanguage);
 
     QString shortVersion;
     if ((project != "Qtopia") && (project != "Qt Extended")) {
@@ -1653,7 +1664,9 @@ void HtmlGenerator::generateHeader(const QString& title,
     }
 
     out() << "<head>\n"
-             "  <title>" << shortVersion << protect(title) << "</title>\n";
+             "  <title>" << shortVersion << protectEnc(title) << "</title>\n";
+    out() << QString("<meta http-equiv=\"Content-type\" content=\"text/html; charset=%1\" />").arg(outputEncoding);
+
     if (!style.isEmpty())
         out() << "    <style type=\"text/css\">" << style << "</style>\n";
 
@@ -1662,8 +1675,8 @@ void HtmlGenerator::generateHeader(const QString& title,
         QMapIterator<QString, QString> i(metaMap);
         while (i.hasNext()) {
             i.next();
-            out() << "    <meta name=\"" << protect(i.key()) << "\" contents=\""
-                  << protect(i.value()) << "\" />\n";
+            out() << "    <meta name=\"" << protectEnc(i.key()) << "\" contents=\""
+                  << protectEnc(i.value()) << "\" />\n";
         }
     }
 
@@ -1687,9 +1700,9 @@ void HtmlGenerator::generateHeader(const QString& title,
 
             navigationLinks += "[Previous: <a href=\"" + anchorPair.first + "\">";
             if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty())
-                navigationLinks += protect(anchorPair.second);
+                navigationLinks += protectEnc(anchorPair.second);
             else
-                navigationLinks += protect(linkPair.second);
+                navigationLinks += protectEnc(linkPair.second);
             navigationLinks += "</a>]\n";
         }
         if (node->links().contains(Node::ContentsLink)) {
@@ -1705,9 +1718,9 @@ void HtmlGenerator::generateHeader(const QString& title,
 
             navigationLinks += "[<a href=\"" + anchorPair.first + "\">";
             if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty())
-                navigationLinks += protect(anchorPair.second);
+                navigationLinks += protectEnc(anchorPair.second);
             else
-                navigationLinks += protect(linkPair.second);
+                navigationLinks += protectEnc(linkPair.second);
             navigationLinks += "</a>]\n";
         }
         if (node->links().contains(Node::NextLink)) {
@@ -1723,9 +1736,9 @@ void HtmlGenerator::generateHeader(const QString& title,
 
             navigationLinks += "[Next: <a href=\"" + anchorPair.first + "\">";
             if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty())
-                navigationLinks += protect(anchorPair.second);
+                navigationLinks += protectEnc(anchorPair.second);
             else
-                navigationLinks += protect(linkPair.second);
+                navigationLinks += protectEnc(linkPair.second);
             navigationLinks += "</a>]\n";
         }
         if (node->links().contains(Node::IndexLink)) {
@@ -1776,7 +1789,7 @@ void HtmlGenerator::generateTitle(const QString& title,
                                   const Node *relative,
                                   CodeMarker *marker)
 {
-    out() << "<h1 class=\"title\">" << protect(title);
+    out() << "<h1 class=\"title\">" << protectEnc(title);
     if (!subTitle.isEmpty()) {
         out() << "<br />";
         if (subTitleSize == SmallSubTitle)
@@ -2014,18 +2027,18 @@ QString HtmlGenerator::generateLowStatusMemberFile(const InnerNode *inner,
 
     out() << "<p><ul><li><a href=\""
           << linkForNode(inner, 0) << "\">"
-          << protect(inner->name())
+          << protectEnc(inner->name())
           << " class reference</a></li></ul></p>\n";
 
     for (i = 0; i < sections.size(); ++i) {
-        out() << "<h2>" << protect(sections.at(i).name) << "</h2>\n";
+        out() << "<h2>" << protectEnc(sections.at(i).name) << "</h2>\n";
         generateSectionList(sections.at(i), inner, marker, CodeMarker::Summary);
     }
 
     sections = marker->sections(inner, CodeMarker::Detailed, status);
     for (i = 0; i < sections.size(); ++i) {
         out() << "<hr />\n";
-        out() << "<h2>" << protect(sections.at(i).name) << "</h2>\n";
+        out() << "<h2>" << protectEnc(sections.at(i).name) << "</h2>\n";
 
         NodeList::ConstIterator m = sections.at(i).members.begin();
         while (m != sections.at(i).members.end()) {
@@ -2118,7 +2131,7 @@ void HtmlGenerator::generateAnnotatedList(const Node *relative,
         }
         else {
             out() << "<td>";
-            out() << protect(node->doc().briefText().toString());
+            out() << protectEnc(node->doc().briefText().toString());
             out() << "</td>";
         }
         out() << "</tr>\n";
@@ -2320,7 +2333,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                         << linkForNode(it.value(), relative)
                         << "\">";
                     QStringList pieces = fullName(it.value(), relative, marker).split("::");
-                    out() << protect(pieces.last());
+                    out() << protectEnc(pieces.last());
                     out() << "</a>";
                     if (pieces.size() > 1) {
                         out() << " (";
@@ -2362,7 +2375,7 @@ void HtmlGenerator::generateFunctionIndex(const Node *relative,
 #else
         out() << "<p>";
 #endif
-        out() << protect(f.key()) << ":";
+        out() << protectEnc(f.key()) << ":";
 
         currentLetter = f.key()[0].unicode();
         while (islower(currentLetter) && currentLetter >= nextLetter) {
@@ -2416,7 +2429,7 @@ void HtmlGenerator::generateLegaleseList(const Node *relative,
     QString marked = marker->markedUpSynopsis(node, relative, style);
     QRegExp templateTag("(<[^@>]*>)");
     if (marked.indexOf(templateTag) != -1) {
-        QString contents = protect(marked.mid(templateTag.pos(1),
+        QString contents = protectEnc(marked.mid(templateTag.pos(1),
                                               templateTag.cap(1).length()));
         marked.replace(templateTag.pos(1), templateTag.cap(1).length(),
                         contents);
@@ -2455,7 +2468,7 @@ void HtmlGenerator::generateQmlItem(const Node *node,
     QString marked = marker->markedUpQmlItem(node,summary);
     QRegExp templateTag("(<[^@>]*>)");
     if (marked.indexOf(templateTag) != -1) {
-        QString contents = protect(marked.mid(templateTag.pos(1),
+        QString contents = protectEnc(marked.mid(templateTag.pos(1),
                                               templateTag.cap(1).length()));
         marked.replace(templateTag.pos(1), templateTag.cap(1).length(),
                         contents);
@@ -2561,7 +2574,7 @@ void HtmlGenerator::generateOverviewList(const Node *relative, CodeMarker * /* m
             const FakeNode *groupNode = groupTitlesMap[groupTitle];
             out() << QString("<h3><a href=\"%1\">%2</a></h3>\n").arg(
                         linkForNode(groupNode, relative)).arg(
-                        protect(groupNode->fullTitle()));
+                        protectEnc(groupNode->fullTitle()));
 
             if (fakeNodeMap[groupNode].count() == 0)
                 continue;
@@ -2573,7 +2586,7 @@ void HtmlGenerator::generateOverviewList(const Node *relative, CodeMarker * /* m
                 if (title.startsWith("The "))
                     title.remove(0, 4);
                 out() << "<li><a href=\"" << linkForNode(fakeNode, relative) << "\">"
-                      << protect(title) << "</a></li>\n";
+                      << protectEnc(title) << "</a></li>\n";
             }
             out() << "</ul>\n";
         }
@@ -2587,7 +2600,7 @@ void HtmlGenerator::generateOverviewList(const Node *relative, CodeMarker * /* m
             if (title.startsWith("The "))
                 title.remove(0, 4);
             out() << "<li><a href=\"" << linkForNode(fakeNode, relative) << "\">"
-                  << protect(title) << "</a></li>\n";
+                  << protectEnc(title) << "</a></li>\n";
         }
         out() << "</ul>\n";
     }
@@ -2750,7 +2763,7 @@ void HtmlGenerator::generateSectionInheritedList(const Section& section,
         }
         out() << " inherited from <a href=\"" << fileName((*p).first)
               << "#" << HtmlGenerator::cleanRef(section.name.toLower()) << "\">"
-              << protect(marker->plainFullName((*p).first, relative))
+              << protectEnc(marker->plainFullName((*p).first, relative))
               << "</a></li>\n";
         ++p;
     }
@@ -2765,7 +2778,7 @@ void HtmlGenerator::generateSynopsis(const Node *node,
     QString marked = marker->markedUpSynopsis(node, relative, style);
     QRegExp templateTag("(<[^@>]*>)");
     if (marked.indexOf(templateTag) != -1) {
-        QString contents = protect(marked.mid(templateTag.pos(1),
+        QString contents = protectEnc(marked.mid(templateTag.pos(1),
                                               templateTag.cap(1).length()));
         marked.replace(templateTag.pos(1), templateTag.cap(1).length(),
                         contents);
@@ -3034,7 +3047,7 @@ void HtmlGenerator::generateSectionInheritedList(const Section& section,
         }
         out() << " inherited from <a href=\"" << fileName((*p).first)
               << "#" << HtmlGenerator::cleanRef(section.name.toLower()) << "\">"
-              << protect(marker->plainFullName((*p).first, relative))
+              << protectEnc(marker->plainFullName((*p).first, relative))
               << "</a></li>\n";
         ++p;
     }
@@ -3048,7 +3061,7 @@ void HtmlGenerator::generateSynopsis(const Node *node,
     QString marked = marker->markedUpSynopsis(node, relative, style);
     QRegExp templateTag("(<[^@>]*>)");
     if (marked.indexOf(templateTag) != -1) {
-        QString contents = protect(marked.mid(templateTag.pos(1),
+        QString contents = protectEnc(marked.mid(templateTag.pos(1),
                                               templateTag.cap(1).length()));
         marked.replace(templateTag.pos(1), templateTag.cap(1).length(),
                         contents);
@@ -3246,7 +3259,7 @@ void HtmlGenerator::generateLink(const Atom* atom,
     if (funcLeftParen.indexIn(atom->string()) != -1 && marker->recognizeLanguage("Cpp")) {
         // hack for C++: move () outside of link
         int k = funcLeftParen.pos(1);
-        out() << protect(atom->string().left(k));
+        out() << protectEnc(atom->string().left(k));
         if (link.isEmpty()) {
             if (showBrokenLinks)
                 out() << "</i>";
@@ -3254,7 +3267,7 @@ void HtmlGenerator::generateLink(const Atom* atom,
             out() << "</a>";
         }
         inLink = false;
-        out() << protect(atom->string().mid(k));
+        out() << protectEnc(atom->string().mid(k));
     } else if (marker->recognizeLanguage("Java")) {
 	// hack for Java: remove () and use <tt> when appropriate
         bool func = atom->string().endsWith("()");
@@ -3262,13 +3275,13 @@ void HtmlGenerator::generateLink(const Atom* atom,
         if (tt)
             out() << "<tt>";
         if (func) {
-            out() << protect(atom->string().left(atom->string().length() - 2));
+            out() << protectEnc(atom->string().left(atom->string().length() - 2));
         } else {
-            out() << protect(atom->string());
+            out() << protectEnc(atom->string());
         }
         out() << "</tt>";
     } else {
-        out() << protect(atom->string());
+        out() << protectEnc(atom->string());
     }
 }
 
@@ -3342,7 +3355,12 @@ QString HtmlGenerator::registerRef(const QString& ref)
     return clean;
 }
 
-QString HtmlGenerator::protect(const QString& string)
+QString HtmlGenerator::protectEnc(const QString &string)
+{
+    return protect(string, outputEncoding);
+}
+
+QString HtmlGenerator::protect(const QString &string, const QString &outputEncoding)
 {
 #define APPEND(x) \
     if (html.isEmpty()) { \
@@ -3365,7 +3383,7 @@ QString HtmlGenerator::protect(const QString& string)
             APPEND("&gt;");
         } else if (ch == QLatin1Char('"')) {
             APPEND("&quot;");
-        } else if (ch.unicode() > 0x007F
+        } else if ((outputEncoding == "ISO-8859-1" && ch.unicode() > 0x007F)
                    || (ch == QLatin1Char('*') && i + 1 < n && string.at(i) == QLatin1Char('/'))
                    || (ch == QLatin1Char('.') && i > 2 && string.at(i - 2) == QLatin1Char('.'))) {
             // we escape '*/' and the last dot in 'e.g.' and 'i.e.' for the Javadoc generator
@@ -3495,7 +3513,7 @@ QString HtmlGenerator::refForNode(const Node *node)
         ref = node->name() + "-var";
         break;
     case Node::Target:
-        return protect(node->name());
+        return protectEnc(node->name());
     }
     return registerRef(ref);
 }
@@ -3569,7 +3587,7 @@ void HtmlGenerator::generateFullName(const Node *apparentNode,
         }
     }
     out() << "\">";
-    out() << protect(fullName(apparentNode, relative, marker));
+    out() << protectEnc(fullName(apparentNode, relative, marker));
     out() << "</a>";
 }
 
@@ -3630,12 +3648,12 @@ void HtmlGenerator::generateDetailedMember(const Node *node,
     else if (node->type() == Node::Enum) {
         const EnumNode *enume = static_cast<const EnumNode *>(node);
         if (enume->flagsType()) {
-            out() << "<p>The " << protect(enume->flagsType()->name())
+            out() << "<p>The " << protectEnc(enume->flagsType()->name())
                   << " type is a typedef for "
                   << "<a href=\"qflags.html\">QFlags</a>&lt;"
-                  << protect(enume->name())
+                  << protectEnc(enume->name())
                   << "&gt;. It stores an OR combination of "
-                  << protect(enume->name())
+                  << protectEnc(enume->name())
                   << " values.</p>\n";
         }
     }
@@ -4352,4 +4370,128 @@ void HtmlGenerator::generateInstantiatedBy(const ClassNode* cn,
     }
 }
 
+/*!
+  Generate the <page> element for the given \a node using the \a writer.
+  Return true if a <page> element was written; otherwise return false.
+ */
+bool HtmlGenerator::generatePageElement(QXmlStreamWriter& writer,
+                                        const Node* node,
+                                        CodeMarker* marker) const
+{
+    if (node->pageType() == Node::NoPageType)
+        return false;
+    if (node->name().isEmpty())
+        return true;
+    if (node->access() == Node::Private)
+        return false;
+    if (!node->isInnerNode())
+        return false;
+
+    QString title;
+    QString rawTitle;
+    QString fullTitle;
+    const InnerNode* inner = static_cast<const InnerNode*>(node);
+        
+    writer.writeStartElement("page");
+    QXmlStreamAttributes attributes;
+    QString t;
+    t.setNum(id++);
+    switch (node->type()) {
+    case Node::Fake:
+        {
+            const FakeNode* fake = static_cast<const FakeNode*>(node);
+            title = fake->fullTitle();
+            break;
+        }
+    case Node::Class:
+        {
+            title = node->name() + " Class Reference";
+            break;
+        }
+    case Node::Namespace:
+        {
+            rawTitle = marker->plainName(inner);
+            fullTitle = marker->plainFullName(inner);
+            title = rawTitle + " Namespace Reference";
+            break;
+        }
+    default:
+        title = node->name();
+        break;
+    }
+    writer.writeAttribute("id",t);
+    writer.writeStartElement("pageWords");
+    writer.writeCharacters(title);
+    if (!inner->pageKeywords().isEmpty()) {
+        const QStringList& w = inner->pageKeywords();
+        for (int i = 0; i < w.size(); ++i) {
+            writer.writeCharacters(" ");
+            writer.writeCharacters(w.at(i).toLocal8Bit().constData());
+        }
+    }
+    writer.writeEndElement();
+    writer.writeStartElement("pageTitle");
+    writer.writeCharacters(title);
+    writer.writeEndElement();
+    writer.writeStartElement("pageUrl");
+    writer.writeCharacters(PageGenerator::fileName(node));
+    writer.writeEndElement();
+    writer.writeStartElement("pageType");
+    switch (node->pageType()) {
+    case Node::ApiPage:
+        writer.writeCharacters("APIPage");
+        break;
+    case Node::ArticlePage:
+        writer.writeCharacters("Article");
+        break;
+    case Node::ExamplePage:
+        writer.writeCharacters("Example");
+        break;
+    default:
+        break;
+    }
+    writer.writeEndElement();
+    writer.writeEndElement();
+    return true;
+}
+
+/*!
+  Traverse the tree recursively and generate the <keyword>
+  elements.
+ */
+void HtmlGenerator::generatePageElements(QXmlStreamWriter& writer, const Node* node, CodeMarker* marker) const
+{
+    if (generatePageElement(writer, node, marker)) {
+
+        if (node->isInnerNode()) {
+            const InnerNode *inner = static_cast<const InnerNode *>(node);
+
+            // Recurse to write an element for this child node and all its children.
+            foreach (const Node *child, inner->childNodes())
+                generatePageElements(writer, child, marker);
+        }
+    }
+}
+
+/*!
+  Outputs the file containing the index used for searching the html docs.
+ */
+void HtmlGenerator::generatePageIndex(const QString& fileName, CodeMarker* marker) const
+{
+    QFile file(fileName);
+    if (!file.open(QFile::WriteOnly | QFile::Text))
+        return ;
+
+    QXmlStreamWriter writer(&file);
+    writer.setAutoFormatting(true);
+    writer.writeStartDocument();
+    writer.writeStartElement("qtPageIndex");
+
+    generatePageElements(writer, myTree->root(), marker);
+
+    writer.writeEndElement(); // qtPageIndex
+    writer.writeEndDocument();
+    file.close();
+}
+
 #endif
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index 19a7c78..369d6c3 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -50,6 +50,7 @@
 
 #include <qmap.h>
 #include <qregexp.h>
+#include <QXmlStreamWriter>
 
 #include "codemarker.h"
 #include "config.h"
@@ -104,7 +105,8 @@ class HtmlGenerator : public PageGenerator
     virtual QString format();
     virtual void generateTree(const Tree *tree, CodeMarker *marker);
 
-    static QString protect(const QString& string);
+    QString protectEnc(const QString &string);
+    static QString protect(const QString &string, const QString &encoding = "ISO-8859-1");
     static QString cleanRef(const QString& ref);
     static QString sinceTitle(int i) { return sinceTitles[i]; }
 
@@ -115,7 +117,7 @@ class HtmlGenerator : public PageGenerator
                              CodeMarker *marker);
     virtual void generateClassLikeNode(const InnerNode *inner, CodeMarker *marker);
     virtual void generateFakeNode(const FakeNode *fake, CodeMarker *marker);
-    virtual QString fileExtension(const Node *node);
+    virtual QString fileExtension(const Node *node) const;
     virtual QString refForNode(const Node *node);
     virtual QString linkForNode(const Node *node, const Node *relative);
     virtual QString refForAtom(Atom *atom, const Node *node);
@@ -261,6 +263,14 @@ class HtmlGenerator : public PageGenerator
                    const Node *relative, 
                    CodeMarker *marker);
     void endLink();
+    bool generatePageElement(QXmlStreamWriter& writer, 
+                             const Node* node, 
+                             CodeMarker* marker) const;
+    void generatePageElements(QXmlStreamWriter& writer, 
+                              const Node* node, 
+                              CodeMarker* marker) const;
+    void generatePageIndex(const QString& fileName, 
+                           CodeMarker* marker) const;
 
 #if 0
     NavigationBar currentNavigationBar;
@@ -315,6 +325,7 @@ class HtmlGenerator : public PageGenerator
     NewSinceMaps newSinceMaps;
     static QString sinceTitles[];
     NewClassMaps newClassMaps;
+    static int id;
 };
 
 #define HTMLGENERATOR_ADDRESS           "address"
diff --git a/tools/qdoc3/javadocgenerator.cpp b/tools/qdoc3/javadocgenerator.cpp
index 001bd27..eb9c1c9 100644
--- a/tools/qdoc3/javadocgenerator.cpp
+++ b/tools/qdoc3/javadocgenerator.cpp
@@ -145,7 +145,7 @@ void JavadocGenerator::generateTree(const Tree *tree, CodeMarker *marker)
     HtmlGenerator::generateTree(tree, marker);
 }
 
-QString JavadocGenerator::fileExtension(const Node *node)
+QString JavadocGenerator::fileExtension(const Node *node) const
 {
     if (node->type() == Node::Fake) {
         return "html";
diff --git a/tools/qdoc3/javadocgenerator.h b/tools/qdoc3/javadocgenerator.h
index 73452cf..b485502 100644
--- a/tools/qdoc3/javadocgenerator.h
+++ b/tools/qdoc3/javadocgenerator.h
@@ -61,7 +61,7 @@ public:
     QString imageFileName(const Node *relative, const QString &fileBase);
 
 protected:
-    QString fileExtension(const Node *node);
+    QString fileExtension(const Node *node) const;
     void startText( const Node *relative, CodeMarker *marker );
     void endText( const Node *relative, CodeMarker *marker );
     int generateAtom( const Atom *atom, const Node *relative, CodeMarker *marker );
diff --git a/tools/qdoc3/linguistgenerator.cpp b/tools/qdoc3/linguistgenerator.cpp
index d1bd22d..702f0fb 100644
--- a/tools/qdoc3/linguistgenerator.cpp
+++ b/tools/qdoc3/linguistgenerator.cpp
@@ -82,14 +82,14 @@ QString LinguistGenerator::format()
     return "Linguist";
 }
 
-QString LinguistGenerator::fileExtension(const Node * /* node */)
+QString LinguistGenerator::fileExtension(const Node * /* node */) const
 {
     return "ts";
 }
 
 void LinguistGenerator::generateClassLikeNode(const InnerNode *inner, CodeMarker *marker)
 {
-    out().setCodec("utf-8");
+    out().setCodec("UTF-8");
 
     QDomDocument document("TS");
     QDomElement documentElement = document.createElement("TS");
@@ -100,7 +100,7 @@ void LinguistGenerator::generateClassLikeNode(const InnerNode *inner, CodeMarker
         documentElement.appendChild(element);
 
     QDomProcessingInstruction process = document.createProcessingInstruction(
-        "xml", QString("version=\"1.0\" encoding=\"%1\"").arg("utf-8"));
+        "xml", QString("version=\"1.0\" encoding=\"%1\"").arg("UTF-8"));
     document.appendChild(process);
     document.appendChild(documentElement);
 
diff --git a/tools/qdoc3/linguistgenerator.h b/tools/qdoc3/linguistgenerator.h
index f7f0606..979db02 100644
--- a/tools/qdoc3/linguistgenerator.h
+++ b/tools/qdoc3/linguistgenerator.h
@@ -70,7 +70,7 @@ protected:
     virtual void generateClassLikeNode(const InnerNode *inner,
                                        CodeMarker *marker);
     virtual void generateFakeNode( const FakeNode *fake, CodeMarker *marker );
-    virtual QString fileExtension(const Node *node);
+    virtual QString fileExtension(const Node *node) const;
 
     QList<QDomElement> generateIndexSections(QDomDocument &document,
                        const Node *node, CodeMarker *marker);
diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp
index 3d0106d..57823fb 100644
--- a/tools/qdoc3/main.cpp
+++ b/tools/qdoc3/main.cpp
@@ -337,8 +337,9 @@ static void processQdocconfFile(const QString &fileName)
       Generate the XML tag file, if it was requested.
      */
     QString tagFile = config.getString(CONFIG_TAGFILE);
-    if (!tagFile.isEmpty())
+    if (!tagFile.isEmpty()) {
         tree->generateTagFile(tagFile);
+    }
 
     tree->setVersion("");
     Generator::terminate();
diff --git a/tools/qdoc3/mangenerator.cpp b/tools/qdoc3/mangenerator.cpp
index c3b7780..1e85b73 100644
--- a/tools/qdoc3/mangenerator.cpp
+++ b/tools/qdoc3/mangenerator.cpp
@@ -187,7 +187,7 @@ void ManGenerator::generateFakeNode( const FakeNode *fake, CodeMarker *marker )
     generateFooter();
 }
 
-QString ManGenerator::fileExtension(const Node * /* node */)
+QString ManGenerator::fileExtension(const Node * /* node */) const
 {
     return "3qt";
 }
diff --git a/tools/qdoc3/mangenerator.h b/tools/qdoc3/mangenerator.h
index 284517e..0fca342 100644
--- a/tools/qdoc3/mangenerator.h
+++ b/tools/qdoc3/mangenerator.h
@@ -63,7 +63,7 @@ protected:
 			      CodeMarker *marker );
     virtual void generateClassLikeNode(const InnerNode *node, CodeMarker *marker);
     virtual void generateFakeNode( const FakeNode *fake, CodeMarker *marker );
-    virtual QString fileExtension(const Node *node);
+    virtual QString fileExtension(const Node *node) const;
 
 private:
     void generateHeader( const QString& name );
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index 9357671..ec574f8 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -92,8 +92,9 @@ void Node::setDoc(const Doc& doc, bool replace)
 Node::Node(Type type, InnerNode *parent, const QString& name)
     : typ(type),
       acc(Public),
-      sta(Commendable),
       saf(UnspecifiedSafeness),
+      pageTyp(NoPageType),
+      sta(Commendable),
       par(parent),
       rel(0),
       nam(name)
@@ -103,6 +104,7 @@ Node::Node(Type type, InnerNode *parent, const QString& name)
 }
 
 /*!
+  Returns the node's URL.
  */
 QString Node::url() const
 {
@@ -110,13 +112,25 @@ QString Node::url() const
 }
 
 /*!
+  Sets the node's URL to \a url
  */
 void Node::setUrl(const QString &url)
 {
     u = url;
 }
 
+void Node::setPageType(const QString& t)
+{
+    if ((t == "API") || (t == "api"))
+        pageTyp = ApiPage;
+    else if (t == "article")
+        pageTyp = ArticlePage;
+    else if (t == "example")
+        pageTyp = ExamplePage;
+}
+
 /*!
+  Sets the pointer to the node that this node relates to.
  */
 void Node::setRelates(InnerNode *pseudoParent)
 {
@@ -401,7 +415,7 @@ void InnerNode::deleteChildren()
 }
 
 /*!
-  Returns true.
+  Returns true because this is an inner node.
  */
 bool InnerNode::isInnerNode() const
 {
@@ -455,6 +469,9 @@ const EnumNode *InnerNode::findEnumNodeForValue(const QString &enumValue) const
 }
 
 /*!
+  Returnds the sequence number of the function node \a func
+  in the list of overloaded functions for a class, such that
+  all the functions have the same name as the \a func.
  */
 int InnerNode::overloadNumber(const FunctionNode *func) const
 {
@@ -468,6 +485,8 @@ int InnerNode::overloadNumber(const FunctionNode *func) const
 }
 
 /*!
+  Returns the number of member functions of a class such that
+  the functions are all named \a funcName.
  */
 int InnerNode::numOverloads(const QString& funcName) const
 {
@@ -480,6 +499,8 @@ int InnerNode::numOverloads(const QString& funcName) const
 }
 
 /*!
+  Returns a node list containing all the member functions of
+  some class such that the functions overload the name \a funcName.
  */
 NodeList InnerNode::overloads(const QString &funcName) const
 {
@@ -499,6 +520,8 @@ NodeList InnerNode::overloads(const QString &funcName) const
 InnerNode::InnerNode(Type type, InnerNode *parent, const QString& name)
     : Node(type, parent, name)
 {
+    if (type == Class)
+        setPageType(ApiPage);
 }
 
 /*!
@@ -682,6 +705,8 @@ bool LeafNode::isInnerNode() const
 }
 
 /*!
+  Constructs a leaf node named \a name of the specified
+  \a type. The new leaf node becomes a child of \a parent.
  */
 LeafNode::LeafNode(Type type, InnerNode *parent, const QString& name)
     : Node(type, parent, name)
@@ -693,10 +718,12 @@ LeafNode::LeafNode(Type type, InnerNode *parent, const QString& name)
  */
 
 /*!
+  Constructs a namespace node.
  */
 NamespaceNode::NamespaceNode(InnerNode *parent, const QString& name)
     : InnerNode(Namespace, parent, name)
 {
+    setPageType(ApiPage);
 }
 
 /*!
@@ -704,11 +731,13 @@ NamespaceNode::NamespaceNode(InnerNode *parent, const QString& name)
  */
 
 /*!
+  Constructs a class node. A class node will generate an API page.
  */
 ClassNode::ClassNode(InnerNode *parent, const QString& name)
     : InnerNode(Class, parent, name)
 {
     hidden = false;
+    setPageType(ApiPage);
 }
 
 /*!
@@ -765,11 +794,28 @@ void ClassNode::fixBaseClasses()
 
 /*!
   The type of a FakeNode is Fake, and it has a \a subtype,
-  which specifies the type of FakeNode.
+  which specifies the type of FakeNode. The page type for
+  the page index is set here.
  */
 FakeNode::FakeNode(InnerNode *parent, const QString& name, SubType subtype)
     : InnerNode(Fake, parent, name), sub(subtype)
 {
+    switch (subtype) {
+    case Module:
+    case Page:
+    case Group:
+        setPageType(ArticlePage);
+        break;
+    case QmlClass:
+    case QmlBasicType:
+        setPageType(ApiPage);
+        break;
+    case Example:
+        setPageType(ExamplePage);
+        break;
+    default:
+        break;
+    }
 }
 
 /*!
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index 077aeb8..021a052 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -137,6 +137,13 @@ class Node
         AppendixLink */ 
     };
 
+    enum PageType {
+        NoPageType,
+        ApiPage,
+        ArticlePage,
+        ExamplePage
+    };
+
     virtual ~Node();
 
     void setAccess(Access access) { acc = access; }
@@ -150,6 +157,8 @@ class Node
     void setLink(LinkType linkType, const QString &link, const QString &desc);
     void setUrl(const QString &url);
     void setTemplateStuff(const QString &templateStuff) { tpl = templateStuff; }
+    void setPageType(PageType t) { pageTyp = t; }
+    void setPageType(const QString& t);
 
     virtual bool isInnerNode() const = 0;
     virtual bool isReimp() const { return false; }
@@ -173,6 +182,8 @@ class Node
     ThreadSafeness inheritedThreadSafeness() const;
     QString since() const { return sinc; }
     QString templateStuff() const { return tpl; }
+    PageType pageType() const { return pageTyp; }
+    virtual void addPageKeywords(const QString& ) { }
 
     void clearRelated() { rel = 0; }
 
@@ -186,13 +197,15 @@ class Node
 #ifdef Q_WS_WIN
     Type typ;
     Access acc;
-    Status sta;
     ThreadSafeness saf;
+    PageType pageTyp;
+    Status sta;
 #else
     Type typ : 4;
     Access acc : 2;
-    Status sta : 3;
     ThreadSafeness saf : 2;
+    PageType pageTyp : 4;
+    Status sta : 3;
 #endif
     InnerNode *par;
     InnerNode *rel;
@@ -244,6 +257,8 @@ class InnerNode : public Node
 
     QStringList primaryKeys();
     QStringList secondaryKeys();
+    const QStringList& pageKeywords() const { return pageKeywds; }
+    virtual void addPageKeywords(const QString& t) { pageKeywds << t; }
 
  protected:
     InnerNode(Type type, InnerNode *parent, const QString& name);
@@ -256,6 +271,7 @@ class InnerNode : public Node
     void removeChild(Node *child);
     void removeRelated(Node *pseudoChild);
 
+    QStringList pageKeywds;
     QStringList inc;
     NodeList children;
     NodeList enumChildren;
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp
index 07edcc4..2cad9ed 100644
--- a/tools/qdoc3/pagegenerator.cpp
+++ b/tools/qdoc3/pagegenerator.cpp
@@ -77,7 +77,7 @@ void PageGenerator::generateTree(const Tree *tree, CodeMarker *marker)
     generateInnerNode(tree->root(), marker);
 }
 
-QString PageGenerator::fileBase(const Node *node)
+QString PageGenerator::fileBase(const Node *node) const
 {
     if (node->relates())
 	node = node->relates();
@@ -153,7 +153,7 @@ QString PageGenerator::fileBase(const Node *node)
     return res;
 }
 
-QString PageGenerator::fileName(const Node *node)
+QString PageGenerator::fileName(const Node *node) const
 {
     if (!node->url().isEmpty())
         return node->url();
@@ -177,7 +177,7 @@ void PageGenerator::beginSubPage(const Location& location,
 	location.fatal(tr("Cannot open output file '%1'")
 			.arg(outFile->fileName()));
     QTextStream *out = new QTextStream(outFile);
-    out->setCodec("ISO-8859-1");
+    out->setCodec(outputCodec);
     outStreamStack.push(out);
 }
 
diff --git a/tools/qdoc3/pagegenerator.h b/tools/qdoc3/pagegenerator.h
index db24edd..7ab7e5e 100644
--- a/tools/qdoc3/pagegenerator.h
+++ b/tools/qdoc3/pagegenerator.h
@@ -54,6 +54,8 @@
 
 QT_BEGIN_NAMESPACE
 
+class QTextCodec;
+
 class ClassNode;
 class InnerNode;
 class NamespaceNode;
@@ -67,15 +69,19 @@ class PageGenerator : public Generator
     virtual void generateTree(const Tree *tree, CodeMarker *marker);
 
  protected:
-    virtual QString fileBase(const Node *node);
-    virtual QString fileExtension(const Node *node) = 0;
-    QString fileName(const Node *node);
+    virtual QString fileBase(const Node *node) const;
+    virtual QString fileExtension(const Node *node) const = 0;
+    QString fileName(const Node *node) const;
     QString outFileName();
     void beginSubPage(const Location& location, const QString& fileName);
     void endSubPage();
     virtual void generateInnerNode(const InnerNode *node, CodeMarker *marker);
     QTextStream& out();
 
+    QString naturalLanguage;
+    QString outputEncoding;
+    QTextCodec *outputCodec;
+
  private:
     QStack<QTextStream *> outStreamStack;
 };
diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index 441bf39..7705692 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -105,5 +105,26 @@ SOURCES += apigenerator.cpp \
            webxmlgenerator.cpp \
 	   yyindent.cpp
 
+### Documentation for qdoc3 ###
+
+win32:!win32-g++ {
+    unixstyle = false
+} else :win32-g++:isEmpty(QMAKE_SH) {
+    unixstyle = false
+} else {
+    unixstyle = true
+}
+
+$$unixstyle {
+    QDOC = cd $$PWD/doc && $$[QT_INSTALL_BINS]/qdoc3
+} else {
+    QDOC = cd $$PWD/doc && $$[QT_INSTALL_BINS]/qdoc3.exe
+    QDOC = $$replace(QDOC, "/", "\\")
+}
+
+docs.commands = $$QDOC qdoc-manual.qdocconf
+
+QMAKE_EXTRA_TARGETS += docs
+
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target
diff --git a/tools/qdoc3/qsakernelparser.cpp b/tools/qdoc3/qsakernelparser.cpp
index 9320a17..8f12eda 100644
--- a/tools/qdoc3/qsakernelparser.cpp
+++ b/tools/qdoc3/qsakernelparser.cpp
@@ -70,8 +70,8 @@ void QsaKernelParser::parseSourceFile( const Location& location,
 				       const QString& filePath,
 				       Tree * /* tree */ )
 {
-    FILE *in = fopen( QFile::encodeName(filePath), "r" );
-    if ( in == 0 ) {
+    QFile in(filePath);
+    if (!in.open(QIODevice::ReadOnly)) {
         location.error( tr("Cannot open QSA kernel file '%1'").arg(filePath) );
         return;
     }
@@ -171,7 +171,7 @@ void QsaKernelParser::parseSourceFile( const Location& location,
 	    readToken();
 	}
     }
-    fclose( in );
+    in.close();
 }
 
 void QsaKernelParser::doneParsingSourceFiles( Tree * /* tree */ )
diff --git a/tools/qdoc3/qscodeparser.cpp b/tools/qdoc3/qscodeparser.cpp
index 8b3bc98..3b8bc1a 100644
--- a/tools/qdoc3/qscodeparser.cpp
+++ b/tools/qdoc3/qscodeparser.cpp
@@ -151,8 +151,8 @@ void QsCodeParser::parseHeaderFile(const Location& location,
 {
     qsTre = tree;
 
-    FILE *in = fopen(QFile::encodeName(filePath), "r");
-    if (in == 0) {
+    QFile in(filePath);
+    if (!in.open(QIODevice::ReadOnly)) {
 	location.error(tr("Cannot open Qt Script class list '%1'")
 			.arg(filePath));
 	return;
@@ -175,7 +175,7 @@ void QsCodeParser::parseHeaderFile(const Location& location,
 	}
 	tok = fileTokenizer.getToken();
     }
-    fclose(in);
+    in.close();
 }
 
 void QsCodeParser::parseSourceFile(const Location& location,
diff --git a/tools/qdoc3/test/qt-api-only_zh_CN.qdocconf b/tools/qdoc3/test/qt-api-only_zh_CN.qdocconf
new file mode 100644
index 0000000..c722ee8
--- /dev/null
+++ b/tools/qdoc3/test/qt-api-only_zh_CN.qdocconf
@@ -0,0 +1,30 @@
+include(qt-build-docs_zh_CN.qdocconf)
+
+# Ensures that the generated index contains a URL that can be used by the
+# tools documentation (assistant.qdocconf, designer.qdocconf, linguist.qdocconf,
+# qmake.qdocconf).
+
+url                     = ./
+
+# Ensures that the documentation for the tools is not included in the generated
+# .qhp file.
+
+qhp.Qt.excluded  += $QT_SOURCE_TREE/doc/src/development/assistant-manual.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/simpletextviewer.qdoc \
+                    $QT_SOURCE_TREE/doc/src/development/designer-manual.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/calculatorbuilder.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/calculatorform.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/customwidgetplugin.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/taskmenuextension.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/containerextension.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/worldtimeclockbuilder.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/worldtimeclockplugin.qdoc \
+                    $QT_SOURCE_TREE/doc/src/internationalization/linguist-manual.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/hellotr.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/arrowpad.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/trollprint.qdoc \
+                    $QT_SOURCE_TREE/doc/src/development/qmake-manual.qdoc
+
+outputdir         = $QT_BUILD_TREE/doc-build/html-qt_zh_CN
+tagfile           = $QT_BUILD_TREE/doc-build/html-qt_zh_CN/qt.tags
+base              = file:$QT_BUILD_TREE/doc-build/html-qt_zh_CN
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 6cc27b6..555e826 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -8,9 +8,13 @@ project                 = Qt
 description             = Qt Reference Documentation
 url                     = http://qt.nokia.com/doc/4.7
 
-edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg \
-                          QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
-                          QtDesigner QtAssistant QAxContainer Phonon \
+sourceencoding          = UTF-8
+outputencoding          = UTF-8
+naturallanguage         = en_US
+
+edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript \
+                          QtScriptTools QtSql QtSvg QtWebKit QtXml QtXmlPatterns \
+                          Qt3Support QtHelp QtDesigner QtAssistant QAxContainer Phonon \
                           QAxServer QtUiTools QtTest QtDBus
 
 edition.DesktopLight.modules = QtCore QtDBus QtGui Qt3SupportLight QtTest
@@ -90,11 +94,13 @@ excludedirs             = $QT_SOURCE_TREE/src/3rdparty/clucene \
                           $QT_SOURCE_TREE/src/3rdparty/webkit/WebCore \
                           $QT_SOURCE_TREE/src/3rdparty/wintab \
                           $QT_SOURCE_TREE/src/3rdparty/zlib \
-                          $QT_SOURCE_TREE/doc/src/snippets \
                           $QT_SOURCE_TREE/src/3rdparty/phonon/gstreamer \
                           $QT_SOURCE_TREE/src/3rdparty/phonon/ds9 \
                           $QT_SOURCE_TREE/src/3rdparty/phonon/qt7 \
-                          $QT_SOURCE_TREE/src/3rdparty/phonon/waveout
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/mmf \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/waveout \
+                          $QT_SOURCE_TREE/doc/src/snippets \
+                          $QT_SOURCE_TREE/doc/src/zh_CN
 
 sources.fileextensions  = "*.cpp *.qdoc *.mm"
 examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml"
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
new file mode 100644
index 0000000..18b72a1
--- /dev/null
+++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
@@ -0,0 +1,92 @@
+include(compat.qdocconf)
+include(macros.qdocconf)
+include(qt-cpp-ignore.qdocconf)
+include(qt-html-templates_zh_CN.qdocconf)
+include(qt-defines.qdocconf)
+
+project                 = Qt
+description             = Qt Reference Documentation
+url                     = http://qt.nokia.com/doc/zh_CN/4.7
+
+sourceencoding          = UTF-8
+outputencoding          = UTF-8
+naturallanguage         = zh-Hans
+
+indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
+
+edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript \
+                          QtScriptTools QtSql QtSvg QtWebKit QtXml QtXmlPatterns \
+                          Qt3Support QtHelp QtDesigner QtAssistant QAxContainer Phonon \
+                          QAxServer QtUiTools QtTest QtDBus
+
+edition.DesktopLight.modules = QtCore QtDBus QtGui Qt3SupportLight QtTest
+edition.DesktopLight.groups       = -graphicsview-api
+
+qhp.projects            = Qt
+
+qhp.Qt.file                = qt.qhp
+qhp.Qt.namespace           = com.trolltech.qt.470
+qhp.Qt.virtualFolder       = qdoc
+qhp.Qt.title               = 教程
+qhp.Qt.indexTitle          = 教程
+qhp.Qt.selectors           = fake:example
+
+qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc zh_CN
+qhp.Qt.customFilters.Qt.name = Qt 4.7.0
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
+
+# Files not referenced in any qdoc file (last four are needed by qtdemo)
+# See also extraimages.HTML
+qhp.Qt.extraFiles          = classic.css \
+                             images/qt-logo.png \
+                             images/taskmenuextension-example.png \
+                             images/coloreditorfactoryimage.png \
+                             images/dynamiclayouts-example.png \
+                             images/stylesheet-coffee-plastique.png
+
+language                = Cpp
+
+sourcedirs              = $QT_SOURCE_TREE/doc/src/zh_CN
+
+excludedirs             = $QT_SOURCE_TREE/src/3rdparty/clucene \
+                          $QT_SOURCE_TREE/src/3rdparty/des \
+                          $QT_SOURCE_TREE/src/3rdparty/freetype \
+                          $QT_SOURCE_TREE/src/3rdparty/harfbuzz \
+                          $QT_SOURCE_TREE/src/3rdparty/kdebase \
+                          $QT_SOURCE_TREE/src/3rdparty/libjpeg \
+                          $QT_SOURCE_TREE/src/3rdparty/libmng \
+                          $QT_SOURCE_TREE/src/3rdparty/libpng \
+                          $QT_SOURCE_TREE/src/3rdparty/libtiff \
+                          $QT_SOURCE_TREE/src/3rdparty/md4 \
+                          $QT_SOURCE_TREE/src/3rdparty/md5 \
+                          $QT_SOURCE_TREE/src/3rdparty/patches \
+                          $QT_SOURCE_TREE/src/3rdparty/sha1 \
+                          $QT_SOURCE_TREE/src/3rdparty/sqlite \
+                          $QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore \
+                          $QT_SOURCE_TREE/src/3rdparty/webkit/WebCore \
+                          $QT_SOURCE_TREE/src/3rdparty/wintab \
+                          $QT_SOURCE_TREE/src/3rdparty/zlib \
+                          $QT_SOURCE_TREE/doc/src/snippets \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/gstreamer \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/ds9 \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/qt7 \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/mmf \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/waveout
+
+sources.fileextensions  = "*.cpp *.qdoc *.mm"
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"
+examples.imageextensions = "*.png"
+
+exampledirs             = $QT_SOURCE_TREE/doc/src \
+                          $QT_SOURCE_TREE/examples \
+                          $QT_SOURCE_TREE/examples/tutorials \
+                          $QT_SOURCE_TREE \
+                          $QT_SOURCE_TREE/qmake/examples \
+                          $QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/docs
+imagedirs               = $QT_SOURCE_TREE/doc/src/images \
+                          $QT_SOURCE_TREE/examples
+outputdir               = $QT_BUILD_TREE/doc/html_zh_CN
+tagfile                 = $QT_BUILD_TREE/doc/html_zh_CN/qt.tags
+base                    = file:$QT_BUILD_TREE/doc/html_zh_CN
+
+HTML.generatemacrefs    = "true"
diff --git a/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
new file mode 100644
index 0000000..5fb68cf
--- /dev/null
+++ b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
@@ -0,0 +1,25 @@
+HTML.stylesheets        = classic.css
+HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\n" \
+                          "<tr>\n" \
+                          "<td align=\"left\" valign=\"top\" width=\"32\">" \
+                          "<a href=\"http://qt.nokia.com/\"><img src=\"images/qt-logo.png\" align=\"left\" border=\"0\" /></a>" \
+                          "</td>\n" \
+                          "<td width=\"1\">&nbsp;&nbsp;</td>" \
+                          "<td class=\"postheader\" valign=\"center\">" \
+                          "<a href=\"http://qt.nokia.com/doc/4.7/index.html\">" \
+                          "<font color=\"#004faf\">主页</font></a>&nbsp;&middot;" \
+                          " <a href=\"http://qt.nokia.com/doc/4.7/classes.html\">" \
+                          "<font color=\"#004faf\">所有类</font></a>&nbsp;&middot;" \
+                          " <a href=\"http://qt.nokia.com/doc/4.7/functions.html\">" \
+                          "<font color=\"#004faf\">所有函数</font></a>&nbsp;&middot;" \
+                          " <a href=\"http://qt.nokia.com/doc/4.7/overviews.html\">" \
+                          "<font color=\"#004faf\">简介</font></a>" \
+                          "</td>" \
+                          "</tr></table>"
+
+HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
+                          "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
+                          "<td width=\"40%\" align=\"left\">版�所有 &copy; 2010 诺基亚公�和/或其�公�</td>\n" \
+                          "<td width=\"20%\" align=\"center\"><a href=\"trademarks.html\">商标</a></td>\n" \
+                          "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \
+                          "</tr></table></div></address>"
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index b65ac56..f7757fb 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -10,9 +10,13 @@ version                 = %VERSION%
 description             = Qt Reference Documentation
 url                     = http://qt.nokia.com/doc/4.7
 
+sourceencoding          = UTF-8
+outputencoding          = UTF-8
+naturallanguage         = en_US
+
 edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript \
                           QtScriptTools QtSql QtSvg QtWebKit QtXml QtXmlPatterns \
-                          Qt3Support QtHelp QtDesigner QAxContainer Phonon \
+                          Qt3Support QtHelp QtDesigner QtAssistant QAxContainer Phonon \
                           QAxServer QtUiTools QtTest QtDBus
 edition.DesktopLight.modules = QtCore QtDBus QtGui Qt3SupportLight QtTest
 edition.DesktopLight.groups       = -graphicsview-api
@@ -91,12 +95,13 @@ excludedirs             = $QTDIR/src/3rdparty/clucene \
                           $QTDIR/src/3rdparty/webkit/WebCore \
                           $QTDIR/src/3rdparty/wintab \
                           $QTDIR/src/3rdparty/zlib \
-                          $QTDIR/doc/src/snippets \
                           $QTDIR/src/3rdparty/phonon/gstreamer \
                           $QTDIR/src/3rdparty/phonon/ds9 \
                           $QTDIR/src/3rdparty/phonon/qt7 \
                           $QTDIR/src/3rdparty/phonon/mmf \
-                          $QTDIR/src/3rdparty/phonon/waveout
+                          $QTDIR/src/3rdparty/phonon/waveout \
+                          $QTDIR/doc/src/snippets \
+                          $QTDIR/doc/src/zh_CN
 
 sources.fileextensions  = "*.cpp *.qdoc *.mm"
 examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml"
diff --git a/tools/qdoc3/tokenizer.cpp b/tools/qdoc3/tokenizer.cpp
index b391759..7c10de6 100644
--- a/tools/qdoc3/tokenizer.cpp
+++ b/tools/qdoc3/tokenizer.cpp
@@ -47,6 +47,7 @@
 #include <qhash.h>
 #include <qregexp.h>
 #include <qstring.h>
+#include <qtextcodec.h>
 
 #include <ctype.h>
 #include <string.h>
@@ -97,6 +98,8 @@ static QRegExp *definedX = 0;
 static QRegExp *defines = 0;
 static QRegExp *falsehoods = 0;
 
+static QTextCodec *sourceCodec = 0;
+
 /*
   This function is a perfect hash function for the 37 keywords of C99
   (with a hash table size of 512). It should perform well on our
@@ -118,13 +121,10 @@ static void insertKwordIntoHash(const char *s, int number)
     kwordHashTable[k] = number;
 }
 
-Tokenizer::Tokenizer(const Location& loc, FILE *in)
+Tokenizer::Tokenizer(const Location& loc, QFile &in)
 {
     init();
-    QFile file;
-    file.open(in, QIODevice::ReadOnly);
-    yyIn = file.readAll();
-    file.close();
+    yyIn = in.readAll();
     yyPos = 0;
     start(loc);
 }
@@ -483,6 +483,11 @@ void Tokenizer::initialize(const Config &config)
 {
     QString versionSym = config.getString(CONFIG_VERSIONSYM);
 
+    QString sourceEncoding = config.getString(CONFIG_SOURCEENCODING);
+    if (sourceEncoding.isEmpty())
+        sourceEncoding = QLatin1String("ISO-8859-1");
+    sourceCodec = QTextCodec::codecForName(sourceEncoding.toLocal8Bit());
+
     comment = new QRegExp("/(?:\\*.*\\*/|/.*\n|/[^\n]*$)");
     comment->setMinimal(true);
     versionX = new QRegExp("$cannot possibly match^");
@@ -750,4 +755,14 @@ bool Tokenizer::isTrue(const QString &condition)
         return !falsehoods->exactMatch(t);
 }
 
+QString Tokenizer::lexeme() const
+{
+    return sourceCodec->toUnicode(yyLex);
+}
+
+QString Tokenizer::previousLexeme() const
+{
+    return sourceCodec->toUnicode(yyPrevLex);
+}
+
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/tokenizer.h b/tools/qdoc3/tokenizer.h
index 519cffb..f55d2ef 100644
--- a/tools/qdoc3/tokenizer.h
+++ b/tools/qdoc3/tokenizer.h
@@ -46,11 +46,10 @@
 #ifndef TOKENIZER_H
 #define TOKENIZER_H
 
+#include <qfile.h>
 #include <qstack.h>
 #include <qstring.h>
 
-#include <stdio.h>
-
 #include "location.h"
 
 QT_BEGIN_NAMESPACE
@@ -99,7 +98,7 @@ class Tokenizer
 {
  public:
     Tokenizer(const Location& loc, const QByteArray &in);
-    Tokenizer(const Location& loc, FILE *in);
+    Tokenizer(const Location& loc, QFile &file);
 
     ~Tokenizer();
 
@@ -108,8 +107,8 @@ class Tokenizer
     bool parsingFnOrMacro() const { return parsingMacro; }
 
     const Location &location() const { return yyTokLoc; }
-    QString previousLexeme() const { return QString(yyPrevLex); }
-    QString lexeme() const { return QString(yyLex); }
+    QString previousLexeme() const;
+    QString lexeme() const;
     QString version() const { return yyVersion; }
     int braceDepth() const { return yyBraceDepth; }
     int parenDepth() const { return yyParenDepth; }
diff --git a/tools/qdoc3/webxmlgenerator.cpp b/tools/qdoc3/webxmlgenerator.cpp
index a3c92ce..205bc8c 100644
--- a/tools/qdoc3/webxmlgenerator.cpp
+++ b/tools/qdoc3/webxmlgenerator.cpp
@@ -90,7 +90,7 @@ QString WebXMLGenerator::format()
     return "WebXML";
 }
 
-QString WebXMLGenerator::fileExtension(const Node * /* node */)
+QString WebXMLGenerator::fileExtension(const Node * /* node */) const
 {
     return "xml";
 }
diff --git a/tools/qdoc3/webxmlgenerator.h b/tools/qdoc3/webxmlgenerator.h
index 3145d50..cadf176 100644
--- a/tools/qdoc3/webxmlgenerator.h
+++ b/tools/qdoc3/webxmlgenerator.h
@@ -69,7 +69,7 @@ protected:
                              const Node *relative, CodeMarker *marker );
     virtual void generateClassLikeNode(const InnerNode *inner, CodeMarker *marker);
     virtual void generateFakeNode(const FakeNode *fake, CodeMarker *marker);
-    virtual QString fileExtension(const Node *node);
+    virtual QString fileExtension(const Node *node) const;
 
     virtual const Atom *addAtomElements(QXmlStreamWriter &writer, const Atom *atom,
                                  const Node *relative, CodeMarker *marker);