Doc: Made QDoc Manual use Qt 5's qdoc

-removed extra qdocconf and files -"make docs" using QMAKE_DOCS -installs the documentation in QT_INSTALL_DOCS -updated title of the manual to "QDoc Manual" -modified listing of contents in Assistant Change-Id: I22f93c0903c5e672a0e7efa83bf3f592658be66d Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-02-07 10:58:15 +01:00 · 2013-02-07 10:58:15 +01:00 · 09e972884e
parent 681085c198
commit 09e972884e
34 changed files with 109 additions and 1231 deletions
--- a/src/tools/qdoc/doc/config/compat.qdocconf
+++ b/src/tools/qdoc/doc/config/compat.qdocconf
@ -1,12 +0,0 @@
-alias.include                   = input
-
-macro.0                         = "\\\\0"
-macro.b                         = "\\\\b"
-macro.n                         = "\\\\n"
-macro.r                         = "\\\\r"
-macro.img                       = "\\image"
-macro.endquote                  = "\\endquotation"
-macro.relatesto                 = "\\relates"
-
-spurious                        = "Missing comma in .*" \
-                                  "Missing pattern .*"
--- a/src/tools/qdoc/doc/config/config.pro
+++ b/src/tools/qdoc/doc/config/config.pro
@ -1,13 +0,0 @@
-SOURCES       = config.pro \
-                compat.qdocconf \
-                qdoc-online.qdocconf \
-                qt-defines.qdocconf \
-                qt-html-templates.qdocconf \
-                qdoc-project.qdocconf \
-                qt-html-default-styles.qdocconf \
-                qdoc.qdocconf \
-                qt-html-online-styles.qdocconf \
-                macros.qdocconf \
-                qt-cpp-ignore.qdocconf \
-                qt-html-templates-online.qdocconf
-
--- a/src/tools/qdoc/doc/config/images/arrow_down.png
+++ b/src/tools/qdoc/doc/config/images/arrow_down.png
--- a/src/tools/qdoc/doc/config/images/bg_l.png
+++ b/src/tools/qdoc/doc/config/images/bg_l.png
--- a/src/tools/qdoc/doc/config/images/bg_l_blank.png
+++ b/src/tools/qdoc/doc/config/images/bg_l_blank.png
--- a/src/tools/qdoc/doc/config/images/bg_ll_blank.png
+++ b/src/tools/qdoc/doc/config/images/bg_ll_blank.png
--- a/src/tools/qdoc/doc/config/images/bg_r.png
+++ b/src/tools/qdoc/doc/config/images/bg_r.png
--- a/src/tools/qdoc/doc/config/images/bg_ul_blank.png
+++ b/src/tools/qdoc/doc/config/images/bg_ul_blank.png
--- a/src/tools/qdoc/doc/config/images/box_bg.png
+++ b/src/tools/qdoc/doc/config/images/box_bg.png
--- a/src/tools/qdoc/doc/config/images/breadcrumb.png
+++ b/src/tools/qdoc/doc/config/images/breadcrumb.png
--- a/src/tools/qdoc/doc/config/images/bullet_dn.png
+++ b/src/tools/qdoc/doc/config/images/bullet_dn.png
--- a/src/tools/qdoc/doc/config/images/bullet_gt.png
+++ b/src/tools/qdoc/doc/config/images/bullet_gt.png
--- a/src/tools/qdoc/doc/config/images/bullet_sq.png
+++ b/src/tools/qdoc/doc/config/images/bullet_sq.png
--- a/src/tools/qdoc/doc/config/images/bullet_up.png
+++ b/src/tools/qdoc/doc/config/images/bullet_up.png
--- a/src/tools/qdoc/doc/config/images/feedbackground.png
+++ b/src/tools/qdoc/doc/config/images/feedbackground.png
--- a/src/tools/qdoc/doc/config/images/header_bg.png
+++ b/src/tools/qdoc/doc/config/images/header_bg.png
--- a/src/tools/qdoc/doc/config/images/horBar.png
+++ b/src/tools/qdoc/doc/config/images/horBar.png
--- a/src/tools/qdoc/doc/config/images/page.png
+++ b/src/tools/qdoc/doc/config/images/page.png
--- a/src/tools/qdoc/doc/config/images/page_bg.png
+++ b/src/tools/qdoc/doc/config/images/page_bg.png
--- a/src/tools/qdoc/doc/config/images/spinner.gif
+++ b/src/tools/qdoc/doc/config/images/spinner.gif
--- a/src/tools/qdoc/doc/config/images/sprites-combined.png
+++ b/src/tools/qdoc/doc/config/images/sprites-combined.png
--- a/src/tools/qdoc/doc/config/macros.qdocconf
+++ b/src/tools/qdoc/doc/config/macros.qdocconf
@ -1,40 +0,0 @@
-macro.aacute.HTML       = "&aacute;"
-macro.Aring.HTML        = "&Aring;"
-macro.aring.HTML        = "&aring;"
-macro.Auml.HTML         = "&Auml;"
-macro.author            = "\\bold{Author:}"
-macro.br.HTML           = "<br />"
-macro.BR.HTML           = "<br />"
-macro.copyright.HTML    = "&copy;"
-macro.eacute.HTML       = "&eacute;"
-macro.gui               = "\\bold"
-macro.hr.HTML           = "<hr />"
-macro.iacute.HTML       = "&iacute;"
-macro.key               = "\\bold"
-macro.menu              = "\\bold"
-macro.note              = "\\bold{Note:}"
-macro.oslash.HTML       = "&oslash;"
-macro.ouml.HTML         = "&ouml;"
-macro.QA                = "\\e{Qt Assistant}"
-macro.QD                = "\\e{Qt Designer}"
-macro.QL                = "\\e{Qt Linguist}"
-macro.QQV               = "\\e{Qt QML Viewer}"
-macro.param             = "\\e"
-macro.raisedaster.HTML  = "<sup>*</sup>"
-macro.rarrow.HTML       = "&rarr;"
-macro.reg.HTML          = "<sup>&reg;</sup>"
-macro.return            = "Returns"
-macro.starslash         = "\\c{*/}"
-macro.begincomment      = "\\c{/*}"
-macro.endcomment        = "\\c{*/}"
-macro.uuml.HTML         = "&uuml;"
-macro.mdash.HTML        = "&mdash;"
-macro.pi.HTML           = "&Pi;"
-macro.beginqdoc.HTML    = "/*!"
-macro.endqdoc.HTML        = "*/"
-
-macro.beginfloatleft.HTML   = "<div style=\"float: left; margin-right: 2em\">"
-macro.beginfloatright.HTML  = "<div style=\"float: right; margin-left: 2em\">"
-macro.endfloat.HTML         = "</div>"
-macro.clearfloat.HTML       = "<br style=\"clear: both\" />"
-macro.emptyspan.HTML        = "<span></span>"
--- a/src/tools/qdoc/doc/config/qdoc-online.qdocconf
+++ b/src/tools/qdoc/doc/config/qdoc-online.qdocconf
@ -1,2 +0,0 @@
-include(qdoc-project.qdocconf)
-include(qt-html-templates-online.qdocconf)
--- a/src/tools/qdoc/doc/config/qdoc-project.qdocconf
+++ b/src/tools/qdoc/doc/config/qdoc-project.qdocconf
@ -1,45 +0,0 @@
-include(compat.qdocconf)
-include(macros.qdocconf)
-include(qt-cpp-ignore.qdocconf)
-include(qt-defines.qdocconf)
-
-sourceencoding = UTF-8
-outputencoding = UTF-8
-naturallanguage = en_US
-
-project          = QDoc
-description      = QDoc Manual
-url = http://doc-snapshot.qt-project.org/qdoc
-
-sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
-headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx"
-examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.qdoc *.qdocconf *.qdocinc"
-examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng"
-
-sourcedirs = ..
-
-exampledirs = .. \
-              ../examples \
-              ../../../../examples \
-              config
-
-imagedirs = ../../../doc/src/templates/images \
-            images
-
-tagfile = ../html/qdoc.tags
-
-qhp.projects            = QDoc
-
-qhp.QDoc.file                = qdoc.qhp
-qhp.QDoc.namespace           = com.trolltech.qdoc
-qhp.QDoc.virtualFolder       = qdoc
-qhp.QDoc.indexTitle          = QDoc Manual - Table of Contents
-qhp.QDoc.indexRoot           =
-
-qhp.QDoc.filterAttributes    = qdoc qtrefdoc
-qhp.QDoc.customFilters.QDoc.name = QDoc
-qhp.QDoc.customFilters.QDoc.filterAttributes = qdoc
-qhp.QDoc.subprojects         = overviews
-qhp.QDoc.subprojects.overviews.title = Overviews
-qhp.QDoc.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QDoc.subprojects.overviews.selectors = fake:page,group,module
--- a/src/tools/qdoc/doc/config/qdoc.qdocconf
+++ b/src/tools/qdoc/doc/config/qdoc.qdocconf
@ -1,2 +1,71 @@
-include(qdoc-project.qdocconf)
-include(qt-html-templates.qdocconf)
+include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+
+project          = QDoc
+description      = QDoc Manual
+url              = http://qt-project.org/doc/qt-$QT_VER
+version          = $QT_VERSION
+
+sourcedirs = ..
+
+exampledirs = .. \
+              ../examples \
+              ../../../../examples \
+              config
+
+imagedirs = ../../../doc/src/templates/images \
+            images
+
+tagfile = ../html/qdoc.tags
+
+qhp.projects            = QDoc
+
+qhp.QDoc.file                = qdoc.qhp
+qhp.QDoc.namespace           = qdoc.$QT_VERSION_TAG
+qhp.QDoc.virtualFolder       = qdoc
+qhp.QDoc.indexTitle          = QDoc Manual
+qhp.QDoc.indexRoot           =
+
+qhp.QDoc.filterAttributes    = qdoc qtrefdoc
+qhp.QDoc.customFilters.QDoc.name = QDoc
+qhp.QDoc.customFilters.QDoc.filterAttributes = qdoc
+qhp.QDoc.subprojects         = overviews
+qhp.QDoc.subprojects.overviews.title = Overviews
+qhp.QDoc.subprojects.overviews.indexTitle = QDoc Manual
+qhp.QDoc.subprojects.overviews.selectors = fake:page,group,module
+
+depends += \
+    activeqt \
+    qtassistant \
+    qtbluetooth \
+    qtconcurrent \
+    qtcontacts \
+    qtcore \
+    qtdbus \
+    qtdesigner \
+    qtdoc \
+    qthelp \
+    qtimageformats \
+    qtgui \
+    qtlocation \
+    qtlinguist \
+    qtmultimedia \
+    qtnetwork \
+    qtopengl \
+    qtorganizer \
+    qtprintsupport \
+    qtqml \
+    qtquick \
+    qtscript \
+    qtscripttools \
+    qtsensors \
+    qtsql \
+    qtsvg \
+    qttestlib \
+    qttools \
+    qtuitools \
+    qtversit \
+    qtwidgets \
+    qtwebkit \
+    qtwebkitexamples \
+    qtxml \
+    qtxmlpatterns
--- a/src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf
+++ b/src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf
@ -1,98 +0,0 @@
-Cpp.ignoretokens        = QAXFACTORY_EXPORT \
-                          QDESIGNER_COMPONENTS_LIBRARY \
-                          QDESIGNER_EXTENSION_LIBRARY \
-                          QDESIGNER_SDK_LIBRARY \
-                          QDESIGNER_SHARED_LIBRARY \
-                          QDESIGNER_UILIB_LIBRARY \
-                          QM_EXPORT_CANVAS \
-                          QM_EXPORT_DNS \
-                          QM_EXPORT_DOM \
-                          QM_EXPORT_FTP \
-                          QM_EXPORT_HTTP \
-                          QM_EXPORT_ICONVIEW \
-                          QM_EXPORT_NETWORK \
-                          QM_EXPORT_OPENGL \
-                          QM_EXPORT_OPENVG \
-                          QM_EXPORT_SQL \
-                          QM_EXPORT_TABLE \
-                          QM_EXPORT_WORKSPACE \
-                          QM_EXPORT_XML \
-                          QT_ASCII_CAST_WARN \
-                          QT_ASCII_CAST_WARN_CONSTRUCTOR \
-                          QT_BEGIN_HEADER \
-                          QT_DESIGNER_STATIC \
-                          QT_END_HEADER \
-                          QT_FASTCALL \
-                          QT_WIDGET_PLUGIN_EXPORT \
-                          Q_COMPAT_EXPORT \
-                          Q_CORE_EXPORT \
-                          Q_CORE_EXPORT_INLINE \
-                          Q_EXPLICIT \
-                          Q_EXPORT \
-                          Q_EXPORT_CODECS_CN \
-                          Q_EXPORT_CODECS_JP \
-                          Q_EXPORT_CODECS_KR \
-                          Q_EXPORT_PLUGIN \
-                          Q_GFX_INLINE \
-                          Q_AUTOTEST_EXPORT \
-                          Q_GUI_EXPORT \
-                          Q_GUI_EXPORT_INLINE \
-                          Q_GUI_EXPORT_STYLE_CDE \
-                          Q_GUI_EXPORT_STYLE_COMPACT \
-                          Q_GUI_EXPORT_STYLE_MAC \
-                          Q_GUI_EXPORT_STYLE_MOTIF \
-                          Q_GUI_EXPORT_STYLE_MOTIFPLUS \
-                          Q_GUI_EXPORT_STYLE_PLATINUM \
-                          Q_GUI_EXPORT_STYLE_POCKETPC \
-                          Q_GUI_EXPORT_STYLE_SGI \
-                          Q_GUI_EXPORT_STYLE_WINDOWS \
-                          Q_GUI_EXPORT_STYLE_WINDOWSXP \
-                          QHELP_EXPORT \
-                          Q_INLINE_TEMPLATE \
-                          Q_INTERNAL_WIN_NO_THROW \
-                          Q_LOCATION_EXPORT \
-                          Q_NETWORK_EXPORT \
-                          Q_OPENGL_EXPORT \
-                          Q_OPENVG_EXPORT \
-                          Q_OUTOFLINE_TEMPLATE \
-                          Q_SQL_EXPORT \
-                          Q_SVG_EXPORT \
-                          Q_SCRIPT_EXPORT \
-                          Q_SCRIPTTOOLS_EXPORT \
-                          Q_TESTLIB_EXPORT \
-                          Q_XML_EXPORT \
-                          Q_XMLSTREAM_EXPORT \
-                          Q_XMLPATTERNS_EXPORT \
-                          QDBUS_EXPORT \
-                          Q_DBUS_EXPORT \
-                          QT_BEGIN_NAMESPACE \
-                          QT_BEGIN_INCLUDE_NAMESPACE \
-                          QT_END_NAMESPACE \
-                          QT_END_INCLUDE_NAMESPACE \
-                          PHONON_EXPORT \
-                          Q_DECLARATIVE_EXPORT \
-                          Q_GADGET \
-                          QWEBKIT_EXPORT \
-                          Q_INVOKABLE
-Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
-                          Q_DECLARE_INTERFACE \
-                          Q_DECLARE_METATYPE \
-                          Q_DECLARE_OPERATORS_FOR_FLAGS \
-                          Q_DECLARE_PRIVATE \
-                          Q_DECLARE_PUBLIC \
-                          Q_DECLARE_SHARED \
-                          Q_DECLARE_TR_FUNCTIONS \
-                          Q_DECLARE_TYPEINFO \
-                          Q_DISABLE_COPY \
-                          QT_FORWARD_DECLARE_CLASS \
-                          Q_DUMMY_COMPARISON_OPERATOR \
-                          Q_ENUMS \
-                          Q_FLAGS \
-                          Q_INTERFACES \
-                          __attribute__ \
-                          K_DECLARE_PRIVATE \
-                          PHONON_OBJECT \
-                          PHONON_HEIR \
-                          Q_PRIVATE_PROPERTY \
-                          Q_DECLARE_PRIVATE_D \
-                          Q_CLASSINFO
--- a/src/tools/qdoc/doc/config/qt-defines.qdocconf
+++ b/src/tools/qdoc/doc/config/qt-defines.qdocconf
@ -1,16 +0,0 @@
-defines                 = Q_QDOC \
-                          QT_.*_SUPPORT \
-                          QT_.*_LIB \
-                          QT_COMPAT \
-                          QT_KEYPAD_NAVIGATION \
-                          QT3_SUPPORT \
-                          Q_WS_.* \
-                          Q_OS_.* \
-                          Q_BYTE_ORDER \
-                          QT_DEPRECATED \
-                          Q_NO_USING_KEYWORD \
-                          __cplusplus
-
-versionsym              = QT_VERSION_STR
-
-codeindent              = 1
--- a/src/tools/qdoc/doc/config/qt-html-default-styles.qdocconf
+++ b/src/tools/qdoc/doc/config/qt-html-default-styles.qdocconf
@ -1,32 +0,0 @@
-# Define the location of the templates to use. Style sheets and scripts are
-# specified relative to the template directory and will be copied into
-# subdirectories of the output directory.
-
-HTML.templatedir = .
-
-HTML.stylesheets = style/offline.css
-
-HTML.scripts     =
-
-# Files not referenced in any qdoc file (last four needed by qtdemo)
-# See also qhp.Qt.extraFiles
-extraimages.HTML        = qt-logo.png \
-                          arrow_down.png \
-                          breadcrumb.png \
-                          bullet_gt.png \
-                          bullet_dn.png \
-                          bullet_sq.png \
-                          bullet_up.png \
-                          horBar.png \
-                          sprites-combined.png
-
-# Include the style sheets and scripts used.
-
-HTML.headerstyles = \
-    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
-
-HTML.headerscripts =
-
-HTML.endheader = \
-    "</head>\n" \
-    "<body>\n"
--- a/src/tools/qdoc/doc/config/qt-html-online-styles.qdocconf
+++ b/src/tools/qdoc/doc/config/qt-html-online-styles.qdocconf
@ -1,72 +0,0 @@
-# Define the location of the templates to use. Style sheets and scripts are
-# specified relative to the template directory and will be copied into
-# subdirectories of the output directory.
-
-HTML.templatedir = .
-
-HTML.stylesheets = style/narrow.css \
-                   style/style.css \
-                   style/style_ie6.css \
-                   style/style_ie7.css \
-                   style/style_ie8.css \
-                   style/superfish.css
-
-# Adding jquery and functions - providing online tools and search features
-HTML.scripts     = scripts/functions.js \
-                   scripts/narrow.js \
-                   scripts/superfish.js \
-                   scripts/jquery.js
-
-
-# Files not referenced in any qdoc file.
-# See also qhp.Qt.extraFiles
-extraimages.HTML        = qt-logo.png \
-                          bg_l.png \
-                          bg_l_blank.png \
-                          bg_ll_blank.png \
-                          bg_ul_blank.png \
-                          header_bg.png \
-                          bg_r.png \
-                          box_bg.png \
-                          breadcrumb.png \
-                          bullet_gt.png \
-                          bullet_dn.png \
-                          bullet_sq.png \
-                          bullet_up.png \
-                          arrow_down.png \
-                          feedbackground.png \
-                          horBar.png \
-                          page.png \
-                          page_bg.png \
-                          sprites-combined.png \
-                          spinner.gif
-
-# Include the style sheets and scripts used.
-
-HTML.headerstyles = \
-    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />\n" \
-    "  <script src=\"scripts/jquery.js\" type=\"text/javascript\"></script>\n" \
-    "  <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" \
-    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/superfish.css\" />\n" \
-    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/narrow.css\" />\n" \
-    "  <!--[if IE]>\n" \
-    "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">\n" \
-    "<meta http-equiv=\"imagetoolbar\" content=\"no\">\n" \
-    "<![endif]-->\n" \
-    "<!--[if lt IE 7]>\n" \
-    "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie6.css\">\n" \
-    "<![endif]-->\n" \
-    "<!--[if IE 7]>\n" \
-    "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie7.css\">\n" \
-    "<![endif]-->\n" \
-    "<!--[if IE 8]>\n" \
-    "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie8.css\">\n" \
-    "<![endif]-->\n\n"
-
-HTML.headerscripts = \
-    "<script src=\"scripts/superfish.js\" type=\"text/javascript\"></script>\n" \
-    "<script src=\"scripts/narrow.js\" type=\"text/javascript\"></script>\n\n"
-
-HTML.endheader = \
-    "</head>\n" \
-    "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n"
--- a/src/tools/qdoc/doc/config/qt-html-templates-online.qdocconf
+++ b/src/tools/qdoc/doc/config/qt-html-templates-online.qdocconf
@ -1,117 +0,0 @@
-include(qt-html-online-styles.qdocconf)
-
-HTML.postheader = \
-    " <div class=\"header\" id=\"qtdocheader\">\n" \
-    "    <div class=\"content\"> \n" \
-    "    <div id=\"nav-logo\">\n" \
-    "      <a href=\"qdoc-index.html\">Home</a></div>\n" \
-    "    <a href=\"qdoc-index.html\" class=\"qtref\"><span>QDoc Reference Documentation</span></a>\n" \
-    "    <div id=\"narrowsearch\"></div>\n" \
-    "    <div id=\"nav-topright\">\n" \
-    "      <ul>\n" \
-    "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
-    "        <li class=\"nav-topright-dev\"><a href=\"http://developer.qt.nokia.com/\">DEV</a></li>\n" \
-    "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
-    "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
-    "          DOC</a></li>\n" \
-    "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
-    "      </ul>\n" \
-    "    </div>\n" \
-    "    <div id=\"shortCut\">\n" \
-    "      <ul>\n" \
-    "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"qdoc-index.html\">Qt 4.7</a></span></li>\n" \
-    "        <li class=\"shortCut-topleft-active\"><a href=\"http://doc.qt.nokia.com\">ALL VERSIONS" \
-    "        </a></li>\n" \
-    "      </ul>\n" \
-    "     </div>\n" \
-    "    </div>\n" \
-    "  </div>\n" \
-    "  <div class=\"wrapper\">\n" \
-    "    <div class=\"hd\">\n" \
-    "      <span></span>\n" \
-    "    </div>\n" \
-    "    <div class=\"bd group\">\n" \
-    "      <div class=\"wrap\">\n" \
-    "        <div class=\"toolbar\">\n" \
-    "          <div class=\"breadcrumb toolblock\">\n" \
-    "            <ul>\n" \
-    "              <li class=\"first\"><a href=\"qdoc-index.html\">Home</a></li>\n" \
-    "              <!--  Breadcrumbs go here -->\n"
-
-HTML.postpostheader = \
-    "            </ul>\n" \
-    "          </div>\n" \
-    "          <div class=\"toolbuttons toolblock\">\n" \
-    "            <ul>\n" \
-    "              <li id=\"smallA\" class=\"t_button\">A</li>\n" \
-    "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
-    "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
-    "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
-    "                <span>Print</span></a></li>\n" \
-    "            </ul>\n" \
-    "        </div>\n" \
-    "        </div>\n" \
-    "        <div class=\"content mainContent\">\n"
-
-HTML.footer = \
-    "      </div>\n" \
-    "    </div>\n" \
-    "    </div> \n" \
-    "    <div class=\"ft\">\n" \
-    "      <span></span>\n" \
-    "    </div>\n" \
-    "  </div> \n" \
-    "  <div class=\"footer\">\n" \
-    "    <p>\n" \
-    "      <acronym title=\"Copyright\">&copy;</acronym> 2012 Digia Plc and/or its\n" \
-    "      subsidiaries. Documentation contributions included herein are the copyrights of\n" \
-    "      their respective owners.</p>\n" \
-    "    <br />\n" \
-    "    <p>\n" \
-    "      The documentation provided herein is licensed under the terms of the\n" \
-    "      <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation\n" \
-    "      License version 1.3</a> as published by the Free Software Foundation.</p>\n" \
-    "    <p>\n" \
-    "      Documentation sources may be obtained from <a href=\"http://www.qt-project.org\">\n" \
-    "      www.qt-project.org</a>.</p>\n" \
-    "    <br />\n" \
-    "    <p>\n" \
-    "      Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
-    "      in Finland and/or other countries worldwide. All other trademarks are property\n" \
-    "      of their respective owners. <a title=\"Privacy Policy\"\n" \
-    "      href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \
-    "  </div>\n"
-
-
-# Files not referenced in any qdoc file.
-# See also extraimages.HTML
-qhp.QDoc.extraFiles = qdoc-index.html \
-                      images/bg_l.png \
-                      images/bg_l_blank.png \
-                      images/bg_ll_blank.png \
-                      images/bg_ul_blank.png \
-                      images/header_bg.png \
-                      images/bg_r.png \
-                      images/box_bg.png \
-                      images/breadcrumb.png \
-                      images/bullet_gt.png \
-                      images/bullet_dn.png \
-                      images/bullet_sq.png \
-                      images/bullet_up.png \
-                      images/arrow_down.png \
-                      images/feedbackground.png \
-                      images/horBar.png \
-                      images/page.png \
-                      images/page_bg.png \
-                      images/sprites-combined.png \
-                      images/spinner.gif \
-                      scripts/functions.js \
-                      scripts/jquery.js \
-                      scripts/narrow.js \
-                      scripts/superfish.js \
-                      style/narrow.css \
-                      style/superfish.css \
-                      style/style_ie6.css \
-                      style/style_ie7.css \
-                      style/style_ie8.css \
-                      style/style.css
--- a/src/tools/qdoc/doc/config/qt-html-templates.qdocconf
+++ b/src/tools/qdoc/doc/config/qt-html-templates.qdocconf
@ -1,56 +0,0 @@
-include(qt-html-default-styles.qdocconf)
-
-HTML.postheader = \
-    "<div class=\"header\" id=\"qtdocheader\">\n" \
-    "  <div class=\"content\"> \n" \
-    "    <a href=\"qdoc-index.html\" class=\"qtref\"><span>QDoc Reference Documentation</span></a>\n" \
-    "  </div>\n" \
-    "  <div class=\"breadcrumb toolblock\">\n" \
-    "    <ul>\n" \
-    "      <li class=\"first\"><a href=\"qdoc-index.html\">Home</a></li>\n" \
-    "      <!--  Breadcrumbs go here -->\n"
-
-HTML.postpostheader = \
-    "    </ul>\n" \
-    "  </div>\n" \
-    "</div>\n" \
-    "<div class=\"content mainContent\">\n"
-
-HTML.footer = \
-    "  <div class=\"ft\">\n" \
-    "    <span></span>\n" \
-    "  </div>\n" \
-    "</div> \n" \
-    "<div class=\"footer\">\n" \
-    "    <p>\n" \
-    "      <acronym title=\"Copyright\">&copy;</acronym> 2012 Digia Plc and/or its\n" \
-    "      subsidiaries. Documentation contributions included herein are the copyrights of\n" \
-    "      their respective owners.</p>\n" \
-    "    <br />\n" \
-    "    <p>\n" \
-    "      The documentation provided herein is licensed under the terms of the\n" \
-    "      <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation\n" \
-    "      License version 1.3</a> as published by the Free Software Foundation.</p>\n" \
-    "    <p>\n" \
-    "      Documentation sources may be obtained from <a href=\"http://www.qt-project.org\">\n" \
-    "      www.qt-project.org</a>.</p>\n" \
-    "    <br />\n" \
-    "    <p>\n" \
-    "      Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
-    "      in Finland and/or other countries worldwide. All other trademarks are property\n" \
-    "      of their respective owners. <a title=\"Privacy Policy\"\n" \
-    "      href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \
-    "</div>\n" \
-
-# Files not referenced in any qdoc file.
-# See also extraimages.HTML
-qhp.QDoc.extraFiles = qdoc-index.html \
-                      images/arrow_down.png \
-                      images/breadcrumb.png \
-                      images/bullet_gt.png \
-                      images/bullet_dn.png \
-                      images/bullet_sq.png \
-                      images/bullet_up.png \
-                      images/horBar.png \
-                      images/sprites-combined.png \
-                      style/offline.css
--- a/src/tools/qdoc/doc/config/style/offline.css
+++ b/src/tools/qdoc/doc/config/style/offline.css
@ -1,673 +0,0 @@
-@media screen
-{
-
-/* basic elements */
-    html
-    {
-        color: #000000;
-        background: #FFFFFF;
-    }
-    table
-    {
-        border-collapse: collapse;
-        border-spacing: 0;
-    }
-    fieldset, img
-    {
-        border: 0;
-        max-width:100%;
-    }
-    address, caption, cite, code, dfn, em, strong, th, var, optgroup
-    {
-        font-style: inherit;
-        font-weight: inherit;
-    }
-    del, ins
-    {
-        text-decoration: none;
-    }
-    li
-    {
-        list-style: none;
-    }
-    ol li
-    {
-        list-style: decimal;
-    }
-    caption, th
-    {
-        text-align: left;
-    }
-    h1, h2, h3, h4, h5, h6
-    {
-        font-size: 100%;
-    }
-    q:before, q:after
-    {
-        content: '';
-    }
-    abbr, acronym
-    {
-        border: 0;
-        font-variant: normal;
-    }
-    sup, sub
-    {
-        vertical-align: baseline;
-    }
-    tt, .qmlreadonly span, .qmldefault span
-    {
-        word-spacing:0.5em;
-    }
-    legend
-    {
-        color: #000000;
-    }
-    strong
-    {
-        font-weight: bold;
-    }
-    em
-    {
-        font-style: italic;
-    }
-
-    body
-    {
-        margin-left: 0.5em;
-        margin-right: 0.5em;
-    }
-    a
-    {
-        color: #00732F;
-        text-decoration: none;
-    }
-    hr
-    {
-        background-color: #E6E6E6;
-        border: 1px solid #E6E6E6;
-        height: 1px;
-        width: 100%;
-        text-align: left;
-        margin: 1.5em 0 1.5em 0;
-    }
-
-    pre
-    {
-        border: 1px solid #DDDDDD;
-        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
-        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
-        border-radius: 0.7em 0.7em 0.7em 0.7em;
-        margin: 0 1.5em 1em 1em;
-        padding: 1em 1em 1em 1em;
-        overflow-x: auto;
-    }
-    table, pre
-    {
-        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
-        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
-        border-radius: 0.7em 0.7em 0.7em 0.7em;
-        background-color: #F6F6F6;
-        border: 1px solid #E6E6E6;
-        border-collapse: separate;
-        margin-bottom: 2.5em;
-    }
-    pre {
-        font-size: 90%;
-        display: block;
-        overflow:hidden;
-    }
-    thead
-    {
-        margin-top: 0.5em;
-        font-weight: bold
-    }
-    th
-    {
-        padding: 0.5em 1.5em 0.5em 1.5em;
-        background-color: #E1E1E1;
-        border-left: 1px solid #E6E6E6;
-    }
-    td
-    {
-        padding: 0.25em 1.5em 0.25em 2em;
-    }
-
-    td.rightAlign
-    {
-        padding: 0.25em 0.5em 0.25em 1em;
-    }
-    table tr.odd
-    {
-        border-left: 1px solid #E6E6E6;
-        background-color: #F6F6F6;
-        color: #66666E;
-    }
-    table tr.even
-    {
-        border-left: 1px solid #E6E6E6;
-        background-color: #ffffff;
-        color: #66666E;
-    }
-
-    div.float-left
-    {
-        float: left; margin-right: 2em
-    }
-    div.float-right
-    {
-        float: right; margin-left: 2em
-    }
-
-    span.comment
-    {
-        color: #008B00;
-        font-style: italic
-    }
-    span.string, span.char
-    {
-        color: #000084;
-    }
-    span.number
-    {
-        color: #a46200;
-    }
-    span.operator
-    {
-        color: #202020;
-    }
-    span.keyword
-    {
-        color: #840000;
-    }
-    span.name
-    {
-        color: black
-    }
-    span.type
-    {
-        font-weight: bold
-    }
-    span.type a:visited
-    {
-        color: #0F5300;
-    }
-    span.preprocessor
-    {
-        color: #404040
-    }
-/* end basic elements */
-
-/* font style elements */
-    .heading
-    {
-        font-weight: bold;
-        font-size: 125%;
-    }
-    .subtitle
-    {
-        font-size: 110%
-    }
-    .small-subtitle
-    {
-        font-size: 100%
-    }
-    .red
-    {
-        color:red;
-    }
-/* end font style elements */
-
-/* global settings*/
-    .header, .footer
-    {
-        display: block;
-        clear: both;
-        overflow: hidden;
-    }
-/* end global settings*/
-
-/* header elements */
-    .header .qtref
-    {
-        color: #00732F;
-        font-weight: bold;
-        font-size: 130%;
-    }
-
-    .header .content
-    {
-        margin-bottom: 0.5em
-    }
-
-    .naviNextPrevious
-    {
-        display: none
-    }
-    .header .breadcrumb
-    {
-        font-size: 90%;
-        padding: 0.5em 0 0.5em 1em;
-        margin: 0;
-        background-color: #fafafa;
-        height: 1.35em;
-        border-bottom: 1px solid #d1d1d1;
-    }
-
-    .header .breadcrumb ul
-    {
-        margin: 0;
-        padding: 0;
-    }
-
-    .header .content
-    {
-        word-wrap: break-word;
-    }
-
-    .header .breadcrumb ul li
-    {
-        float: left;
-        background: url(../images/breadcrumb.png) no-repeat 0 3px;
-        padding-left: 1.5em;
-        margin-left: 1.5em;
-    }
-
-    .header .breadcrumb ul li.last
-    {
-        font-weight: normal;
-    }
-
-    .header .breadcrumb ul li a
-    {
-        color: #00732F;
-    }
-
-    .header .breadcrumb ul li.first
-    {
-        background-image: none;
-        padding-left: 0;
-        margin-left: 0;
-    }
-
-    .header .content ol li {
-        background: none;
-        margin-bottom: 1.0em;
-        margin-left: 1.2em;
-        padding-left: 0
-    }
-
-    .header .content li
-    {
-        background: url(../images/bullet_sq.png) no-repeat 0 5px;
-        margin-bottom: 1em;
-        padding-left: 1.2em;
-    }
-
-/* end header elements */
-
-/* content elements */
-    .content h1
-    {
-        font-weight: bold;
-        font-size: 150%
-    }
-
-    .content h2
-    {
-        font-weight: bold;
-        font-size: 135%;
-        width: 100%;
-    }
-    .content h3
-    {
-        font-weight: bold;
-        font-size: 120%;
-        width: 100%;
-    }
-    .content table p
-    {
-        margin: 0
-    }
-    .content ul
-    {
-        padding-left: 2.5em;
-    }
-    .content li
-    {
-        padding-top: 0.25em;
-        padding-bottom: 0.25em;
-    }
-    .content ul img {
-        vertical-align: middle;
-    }
-
-    .content a:visited
-    {
-        color: #4c0033;
-        text-decoration: none;
-    }
-
-    .content a:visited:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }
-
-    a:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }
-    descr p a
-    {
-        text-decoration: underline;
-    }
-
-    .descr p a:visited
-    {
-        text-decoration: underline;
-    }
-
-    .alphaChar{
-        width:95%;
-        background-color:#F6F6F6;
-        border:1px solid #E6E6E6;
-        -moz-border-radius: 7px 7px 7px 7px;
-        border-radius: 7px 7px 7px 7px;
-        -webkit-border-radius: 7px 7px 7px 7px;
-        font-size:12pt;
-        padding-left:10px;
-        margin-top:10px;
-        margin-bottom:10px;
-    }
-    .flowList{
-        /*vertical-align:top;*/
-        /*margin:20px auto;*/
-
-        column-count:3;
-        -webkit-column-count:3;
-        -moz-column-count:3;
-/*
-        column-width:100%;
-        -webkit-column-width:200px;
-        -col-column-width:200px;
-*/
-        column-gap:41px;
-        -webkit-column-gap:41px;
-        -moz-column-gap:41px;
-
-        column-rule: 1px dashed #ccc;
-        -webkit-column-rule: 1px dashed #ccc;
-        -moz-column-rule: 1px dashed #ccc;
-    }
-
-    .flowList dl{
-    }
-    .flowList dd{
-        /*display:inline-block;*/
-        margin-left:10px;
-        min-width:250px;
-        line-height: 1.5;
-        min-width:100%;
-        min-height:15px;
-    }
-
-    .flowList dd a{
-    }
-
-    .content .flowList p{
-        padding:0px;
-    }
-
-    .content .alignedsummary
-    {
-        margin: 15px;
-    }
-
-
-    .qmltype
-    {
-        text-align: center;
-        font-size: 120%;
-    }
-    .qmlreadonly
-    {
-        padding-left: 5px;
-        float: right;
-        color: #254117;
-    }
-
-    .qmldefault
-    {
-        padding-left: 5px;
-        float: right;
-        color: red;
-    }
-
-    .qmldoc
-    {
-    }
-
-    .generic .alphaChar{
-        margin-top:5px;
-    }
-
-    .generic .odd .alphaChar{
-        background-color: #F6F6F6;
-    }
-
-    .generic .even .alphaChar{
-        background-color: #FFFFFF;
-    }
-
-    .memItemRight{
-        padding: 0.25em 1.5em 0.25em 0;
-    }
-    .highlightedCode
-    {
-        margin: 1.0em;
-    }
-    .annotated td {
-        padding: 0.25em 0.5em 0.25em 0.5em;
-    }
-
-    .header .content .toc ul
-    {
-        padding-left: 0px;
-    }
-
-    .content .toc h3 {
-        border-bottom: 0px;
-        margin-top: 0px;
-    }
-
-    .content .toc h3 a:hover {
-        color: #00732F;
-        text-decoration: none;
-    }
-
-    .content .toc .level2
-    {
-        margin-left: 1.5em;
-    }
-
-    .content .toc .level3
-    {
-        margin-left: 3.0em;
-    }
-
-    .content ul li
-    {
-        background: url(../images/bullet_sq.png) no-repeat 0 0.7em;
-        padding-left: 1em
-    }
-
-    .content .toc li
-    {
-        background: url(../images/bullet_dn.png) no-repeat 0 5px;
-        padding-left: 1em
-    }
-
-    .relpage
-    {
-        -moz-border-radius: 7px 7px 7px 7px;
-        -webkit-border-radius: 7px 7px 7px 7px;
-        border-radius: 7px 7px 7px 7px;
-        border: 1px solid #DDDDDD;
-        padding: 25px 25px;
-        clear: both;
-    }
-    .relpage ul
-    {
-        float: none;
-        padding: 1.5em;
-    }
-
-    h3.fn, span.fn
-    {
-        -moz-border-radius:7px 7px 7px 7px;
-        -webkit-border-radius:7px 7px 7px 7px;
-        border-radius:7px 7px 7px 7px;
-        background-color: #F6F6F6;
-        border-width: 1px;
-        border-style: solid;
-        border-color: #E6E6E6;
-        font-weight: bold;
-        word-spacing:3px;
-        padding:3px 5px;
-    }
-
-    .functionIndex {
-        font-size:12pt;
-        word-spacing:10px;
-        margin-bottom:10px;
-        background-color: #F6F6F6;
-        border-width: 1px;
-        border-style: solid;
-        border-color: #E6E6E6;
-        -moz-border-radius: 7px 7px 7px 7px;
-        -webkit-border-radius: 7px 7px 7px 7px;
-        border-radius: 7px 7px 7px 7px;
-        width:100%;
-    }
-
-    .centerAlign
-    {
-        text-align:center;
-    }
-
-    .rightAlign
-    {
-        text-align:right;
-    }
-
-    .leftAlign
-    {
-        text-align:left;
-    }
-
-    .topAlign{
-        vertical-align:top
-    }
-
-    .functionIndex a{
-        display:inline-block;
-    }
-
-/* end content elements */
-/* footer elements */
-
-    .footer
-    {
-        color: #393735;
-        font-size: 0.75em;
-        text-align: center;
-        padding-top: 1.5em;
-        padding-bottom: 1em;
-        background-color: #E6E7E8;
-        margin: 0;
-    }
-    .footer p
-    {
-        margin: 0.25em
-    }
-    .small
-    {
-        font-size: 0.5em;
-    }
-/* end footer elements */
-
-    .item {
-      float: left;
-      position: relative;
-      width: 100%;
-      overflow: hidden;
-    }
-
-
-    .item .primary {
-      margin-right: 220px;
-      position: relative;
-    }
-
-    .item hr {
-      margin-left: -220px;
-    }
-
-    .item .secondary {
-      float: right;
-      width: 200px;
-      position: relative;
-    }
-
-    .item .cols {
-      clear: both;
-      display: block;
-    }
-
-    .item .cols .col {
-      float: left;
-      margin-left: 1.5%;
-    }
-
-    .item .cols .col.first {
-      margin-left: 0;
-    }
-
-    .item .cols.two .col {
-      width: 45%;
-    }
-
-    .item .box {
-      margin: 0 0 10px 0;
-    }
-
-    .item .box h3 {
-      margin: 0 0 10px 0;
-    }
-
-    .cols.unclear {
-        clear:none;
-    }
-}
-
-/* end of screen media */
-
-/* start of print media */
-
-@media print
-{
-    input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult
-    {
-        display: none;
-        background: none;
-    }
-    .content
-    {
-        background: none;
-        display: block;
-        width: 100%; margin: 0; float: none;
-    }
-}
-/* end of print media */
--- a/src/tools/qdoc/doc/qdoc-manual.qdoc
+++ b/src/tools/qdoc/doc/qdoc-manual.qdoc
@ -29,7 +29,7 @@
    \page qdoc-index.html
    \nextpage Introduction to QDoc

-    \title Table of Contents
+    \title QDoc Manual

    \list
      \li \l {Introduction to QDoc}
@ -75,8 +75,8 @@

 /*!
    \page 01-qdoc-manual.html
-    \contentspage Table of Contents
-    \previouspage Table of Contents
+    \contentspage QDoc Manual
+    \previouspage QDoc Manual
    \nextpage Command Index

    \title Introduction to QDoc
@ -229,7 +229,7 @@

 /*!
    \page 03-qdoc-commands-markup.html
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \previouspage Naming Things
    \nextpage Text Markup

@ -310,7 +310,7 @@

 /*!
    \page 04-qdoc-commands-textmarkup.html
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \previouspage Markup Commands
    \nextpage Document Structure

@ -924,7 +924,7 @@
 /*!
    \page 05-qdoc-commands-documentstructure.html
    \previouspage Text Markup
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Including Code Inline

    \title Document Structure
@ -1146,7 +1146,7 @@
 /*!
    \page 06-qdoc-commands-includecodeinline.html
    \previouspage Document Structure
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Including External Code

    \title Including Code Inline
@ -1392,7 +1392,7 @@
 /*!
    \page 07-0-qdoc-commands-includingexternalcode.html
    \previouspage Including Code Inline
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Creating Links

    \title Including External Code
@ -2030,7 +2030,7 @@
 /*!
    \page  07-1-example.html
    \previouspage Including External Code
-    \contentspage Table of Contents
+    \contentspage QDoc Manual

    \title Example File

@ -2040,7 +2040,7 @@
 /*!
    \page 08-qdoc-commands-creatinglinks.html
    \previouspage Including External Code
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Including Images

    \title Creating Links
@ -2339,7 +2339,7 @@
 /*!
    \page 09-qdoc-commands-includingimages.html
    \previouspage Creating Links
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Tables and Lists

    \title Including Images
@ -2535,7 +2535,7 @@
 /*!
    \page 10-qdoc-commands-tablesandlists.html
    \previouspage Including Images
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Special Content

    \title Tables and Lists
@ -3061,7 +3061,7 @@
 /*!
    \page 11-qdoc-commands-specialcontent.html
    \previouspage Tables and Lists
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Miscellaneous

    \title Special Content
@ -3496,7 +3496,7 @@
 /*!
    \page 12-0-qdoc-commands-miscellaneous.html
    \previouspage Special Content
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Creating DITA Maps

    \title Miscellaneous
@ -4247,7 +4247,7 @@
 /*!
    \page 12-1-signalandslots.html
    \previouspage Miscellaneous
-    \contentspage Table of Contents
+    \contentspage QDoc Manual

    \title signalandslots.qdocinc

@ -4257,7 +4257,7 @@
 /*!
    \page 12-2-objectmodel.html
    \previouspage Miscellaneous
-    \contentspage Table of Contents
+    \contentspage QDoc Manual

    \title objectmodel.qdocinc

@ -4267,7 +4267,7 @@
 /*!
    \page 12-3-layoutmanagement.html
    \previouspage Miscellaneous
-    \contentspage Table of Contents
+    \contentspage QDoc Manual

    \title layoutmanagement.qdocinc

@ -4277,7 +4277,7 @@
 /*!
    \page 13-qdoc-commands-topics.html
    \previouspage Command Index
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Context Commands

    \title Topic Commands
@ -5887,7 +5887,7 @@
 /*!
    \page 14-qdoc-commands-contextcommands.html
    \previouspage Topic Commands
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Document Navigation

    \title Context Commands
@ -5929,7 +5929,7 @@
 /*!
    \page 15-qdoc-commands-navigation.html
    \previouspage Context Commands
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Reporting Status

    \title Document Navigation
@ -6125,7 +6125,7 @@
 /*!
    \page 16-qdoc-commands-status.html
    \previouspage Document Navigation
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Thread Support

    \title Reporting Status
@ -6427,7 +6427,7 @@
 /*!
    \page 17-qdoc-commands-thread.html
    \previouspage Reporting Status
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Relating Things

    \title Thread Support
@ -6610,7 +6610,7 @@
 /*!
    \page 18-qdoc-commands-relating.html
    \previouspage Thread Support
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Grouping Things

    \title Relating Things
@ -6795,7 +6795,7 @@
 /*!
    \page 19-qdoc-commands-grouping.html
    \previouspage Relating Things
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Naming Things

    \title Grouping Things
@ -6909,7 +6909,7 @@
 /*!
    \page 20-qdoc-commands-namingthings.html
    \previouspage Grouping Things
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Markup Commands

    \title Naming Things
@ -6997,7 +6997,7 @@
 /*!
    \page 21-0-qdoc-creating-dita-maps.html
    \previouspage Miscellaneous
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage The QDoc Configuration File

    \title Creating DITA Maps
@ -7134,7 +7134,7 @@
 /*!
    \page 21-0-qdoc-configuration.html
    \previouspage Creating DITA Maps
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Generic Configuration Variables

    \title The QDoc Configuration File
@ -7246,7 +7246,7 @@
 /*!
    \page 21-1-minimum-qdocconf.html
    \previouspage qt.qdocconf
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Generating DITA XML Output

    \title minimum.qdocconf
@ -7257,7 +7257,7 @@
 /*!
    \page 21-2-qt-qdocconf.html
    \previouspage Supporting Derived Projects
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage minimum.qdocconf

    \title qt.qdocconf
@ -7268,8 +7268,8 @@
 /*!
    \page 21-3-qt-dita-xml-output.html
    \previouspage minimum.qdocconf
-    \contentspage Table of Contents
-    \nextpage Table of Contents
+    \contentspage QDoc Manual
+    \nextpage QDoc Manual

    \title Generating DITA XML Output

@ -7327,7 +7327,7 @@
 /*!
    \page 22-qdoc-configuration-generalvariables.html
    \previouspage The QDoc Configuration File
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Creating Help Project Files

    \title Generic Configuration Variables
@ -8235,7 +8235,7 @@
 /*!
    \page 22-creating-help-project-files.html
    \previouspage Generic Configuration Variables
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage C++ Specific Configuration Variables

    \title Creating Help Project Files
@ -8304,7 +8304,7 @@
 /*!
    \page 23-qdoc-configuration-cppvariables.html
    \previouspage Creating Help Project Files
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage HTML Specific Configuration Variables

    \title C++ Specific Configuration Variables
@ -8418,7 +8418,7 @@
 /*!
    \page 24-qdoc-configuration-htmlvariables.html
    \previouspage C++ Specific Configuration Variables
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Supporting Derived Projects

    \title HTML Specific Configuration Variables
@ -8533,7 +8533,7 @@
 /*!
    \page 25-qdoc-configuration-derivedprojects.html
    \previouspage HTML Specific Configuration Variables
-    \contentspage Table of Contents
+    \contentspage QDoc Manual

    \title Supporting Derived Projects

@ -8674,7 +8674,7 @@
 /*!
    \page 27-qdoc-commands-alphabetical.html
    \previouspage Introduction to QDoc
-    \contentspage Table of Contents
+    \contentspage QDoc Manual
    \nextpage Topic Commands

    \title Command Index
--- a/src/tools/qdoc/qdoc.pro
+++ b/src/tools/qdoc/qdoc.pro
@ -88,21 +88,6 @@ SOURCES += jscodemarker.cpp \
 qtPrepareTool(QDOC, qdoc)
 qtPrepareTool(QHELPGENERATOR, qhelpgenerator)

-equals(QMAKE_DIR_SEP, /) {
-    QDOC = QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QDOC
-} else {
-    QDOC = set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QDOC
-    QDOC = $$replace(QDOC, "/", "\\")
-}
-
-html-docs.commands = $$QDOC $$PWD/doc/config/qdoc.qdocconf
-html-docs.files = $$PWD/doc/html
-
-qch-docs.commands = $$QHELPGENERATOR $$PWD/doc/html/qdoc.qhp -o $$PWD/doc/qch/qdoc.qch
-qch-docs.files = $$PWD/doc/qch
-qch-docs.path = $$[QT_INSTALL_DOCS]
-qch-docs.CONFIG += no_check_exist directory
-
-QMAKE_EXTRA_TARGETS += html-docs qch-docs
+QMAKE_DOCS = $$PWD/doc/config/qdoc.qdocconf

 load(qt_tool)