diff --git a/doc/config/compat.qdocconf b/doc/config/compat.qdocconf
new file mode 100644
index 00000000000..5745ed93b08
--- /dev/null
+++ b/doc/config/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/doc/config/macros.qdocconf b/doc/config/macros.qdocconf
new file mode 100644
index 00000000000..5e1f56238cb
--- /dev/null
+++ b/doc/config/macros.qdocconf
@@ -0,0 +1,40 @@
+macro.aacute.HTML       = "á"
+macro.Aring.HTML        = "Å"
+macro.aring.HTML        = "å"
+macro.Auml.HTML         = "Ä"
+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.QMLD              = "\\e{Qt Quick Designer}"
+macro.QQV               = "\\e{Qt QML Viewer}"
+macro.QSDK              = "\\e{Nokia Qt SDK}"
+macro.qtcversion        = $QTC_VERSION
+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.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>"
diff --git a/doc/config/qt-cpp-ignore.qdocconf b/doc/config/qt-cpp-ignore.qdocconf
new file mode 100644
index 00000000000..ce8de2406d7
--- /dev/null
+++ b/doc/config/qt-cpp-ignore.qdocconf
@@ -0,0 +1,99 @@
+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_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_TYPENAME \
+                          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 \
+                          EXTENSIONSYSTEM_EXPORT
+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
diff --git a/doc/config/qt-defines.qdocconf b/doc/config/qt-defines.qdocconf
new file mode 100644
index 00000000000..1ce9a8045f9
--- /dev/null
+++ b/doc/config/qt-defines.qdocconf
@@ -0,0 +1,19 @@
+defines                 = Q_QDOC \
+                          QT_.*_SUPPORT \
+                          QT_.*_LIB \
+                          QT_COMPAT \
+                          QT_KEYPAD_NAVIGATION \
+			  QT_NO_EGL \
+                          QT3_SUPPORT \
+                          Q_WS_.* \
+                          Q_OS_.* \
+                          Q_BYTE_ORDER \
+			  QT_DEPRECATED \
+                          Q_NO_USING_KEYWORD \
+                          __cplusplus \
+                          qtquick \
+                          qcmanual
+
+versionsym              = QT_VERSION_STR
+
+codeindent              = 1
diff --git a/doc/config/qt-html-default-styles.qdocconf b/doc/config/qt-html-default-styles.qdocconf
new file mode 100644
index 00000000000..2d4f25a5789
--- /dev/null
+++ b/doc/config/qt-html-default-styles.qdocconf
@@ -0,0 +1,33 @@
+# 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 = $SRCDIR/templates
+
+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 \
+                          qtcreator-screenshots.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"
diff --git a/doc/config/qt-html-online-styles.qdocconf b/doc/config/qt-html-online-styles.qdocconf
new file mode 100644
index 00000000000..6db34912fb9
--- /dev/null
+++ b/doc/config/qt-html-online-styles.qdocconf
@@ -0,0 +1,72 @@
+# 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 = $QT_SOURCE_TREE/doc/src/template
+
+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"
diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf
new file mode 100644
index 00000000000..d6d2eba22c7
--- /dev/null
+++ b/doc/config/qt-html-templates-online.qdocconf
@@ -0,0 +1,233 @@
+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=\"index.html\">Home</a></div>\n" \
+    "    <a href=\"index.html\" class=\"qtref\"><span>Qt 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=\"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" \
+    " <ul class=\"sf-menu\" id=\"narrowmenu\"> \n" \
+    "             <li><a href=\"#\">API Lookup</a> \n" \
+    "                 <ul> \n" \
+    "                     <li><a href=\"classes.html\">Class index</a></li> \n" \
+    "           <li><a href=\"functions.html\">Function index</a></li> \n" \
+    "           <li><a href=\"modules.html\">Modules</a></li> \n" \
+    "           <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
+    "           <li><a href=\"qtglobal.html\">Global Declarations</a></li> \n" \
+    "           <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
+    "             </ul> \n" \
+    "             </li> \n" \
+    "             <li><a href=\"#\">Qt Topics</a> \n" \
+    "                 <ul> \n" \
+    "                        <li><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li>  \n" \
+    "                        <li><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li>  \n" \
+    "                        <li><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li>  \n" \
+    "                        <li><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li>  \n" \
+    "                        <li><a href=\"platform-specific.html\">Platform-specific info</a></li>  \n" \
+    "                        <li><a href=\"technology-apis.html\">Qt and Key Technologies</a></li>  \n" \
+    "                        <li><a href=\"best-practices.html\">How-To's and Best Practices</a></li>  \n" \
+    "              </ul> \n" \
+    "                 </li> \n" \
+    "                 <li><a href=\"#\">Examples</a> \n" \
+    "                     <ul> \n" \
+    "                       <li><a href=\"all-examples.html\">Examples</a></li> \n" \
+    "                       <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
+    "                       <li><a href=\"demos.html\">Demos</a></li> \n" \
+    "                       <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
+    "                </ul> \n" \
+    "                     </li> \n" \
+    "                 </ul> \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=\"sidebar\">\n" \
+    "        <div class=\"searchlabel\">\n" \
+    "          Search index:</div>\n" \
+    "        <div class=\"search\" id=\"sidebarsearch\">\n" \
+    "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
+    "            <fieldset>\n" \
+    "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
+    " <div id=\"resultdialog\"> \n" \
+    " <a href=\"#\" id=\"resultclose\">Close</a> \n" \
+    " <p id=\"resultlinks\" class=\"all\"><a href=\"#\" id=\"showallresults\">All</a> | <a href=\"#\" id=\"showapiresults\">API</a> | <a href=\"#\" id=\"showarticleresults\">Articles</a> | <a href=\"#\" id=\"showexampleresults\">Examples</a></p> \n" \
+    " <p id=\"searchcount\" class=\"all\"><span id=\"resultcount\"></span><span id=\"apicount\"></span><span id=\"articlecount\"></span><span id=\"examplecount\"></span>&nbsp;results:</p> \n" \
+    " <ul id=\"resultlist\" class=\"all\"> \n" \
+    " </ul> \n" \
+    " </div> \n" \
+    "            </fieldset>\n" \
+    "          </form>\n" \
+    "        </div>\n" \
+    "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
+    "          <h2 title=\"API Lookup\"><span></span>\n" \
+    "            API Lookup</h2>\n" \
+    "          <div  id=\"list001\" class=\"list\">\n" \
+    "          <ul id=\"ul001\" >\n" \
+    "              <li class=\"defaultLink\"><a href=\"classes.html\">Class index</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global Declarations</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
+    "            </ul> \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"box bottombar\" id=\"topics\">\n" \
+    "          <h2 title=\"Qt Topics\"><span></span>\n" \
+    "            Qt Topics</h2>\n" \
+    "          <div id=\"list002\" class=\"list\">\n" \
+    "            <ul id=\"ul002\" >\n" \
+    "               <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
+    "               <li class=\"defaultLink\"><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li> \n" \
+    "               <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
+    "               <li class=\"defaultLink\"><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
+    "               <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
+    "               <li class=\"defaultLink\"><a href=\"technology-apis.html\">Qt and Key Technologies</a></li> \n" \
+    "               <li class=\"defaultLink\"><a href=\"best-practices.html\">How-To's and Best Practices</a></li> \n" \
+    "            </ul>  \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"box\" id=\"examples\">\n" \
+    "          <h2 title=\"Examples\"><span></span>\n" \
+    "            Examples</h2>\n" \
+    "          <div id=\"list003\" class=\"list\">\n" \
+    "        <ul id=\"ul003\">\n" \
+    "              <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
+    "            </ul> \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "      </div>\n" \
+    "      <div class=\"wrap\">\n" \
+    "        <div class=\"toolbar\">\n" \
+    "          <div class=\"breadcrumb toolblock\">\n" \
+    "            <ul>\n" \
+    "              <li class=\"first\"><a href=\"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 class=\"feedback t_button\">\n" \
+    "          [+] Documentation Feedback</div>\n" \
+    "      </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> 2008-2011 Nokia Corporation and/or its\n" \
+    "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+    "      in Finland and/or other countries worldwide.</p>\n" \
+    "    <p>\n" \
+    "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+    "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+    "    <br />\n" \
+    "    <p>\n" \
+    "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
+    "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
+    "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
+    "    <p>\n" \
+    "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
+    "      Free Documentation License version 1.3</a>\n" \
+    "      as published by the Free Software Foundation.</p>\n" \
+    "  </div>\n" \
+    "  <div id=\"feedbackBox\">\n" \
+    "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
+    "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
+    "      <p id=\"noteHead\">Thank you for giving your feedback.</p> <p class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \
+    "      requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p>\n" \
+    "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \
+    "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
+    "    </form>\n" \
+    "  </div>\n" \
+    "  <div id=\"blurpage\">\n" \
+    "  </div>\n" \
+    "\n" \
+    "  <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" \
+    "  <script type=\"text/javascript\">\n" \
+    "  var _gaq = _gaq || [];\n" \
+    "  _gaq.push(['_setAccount', 'UA-4457116-5']);\n" \
+    "  _gaq.push(['_trackPageview']);\n" \
+    "  (function() {\n" \
+    "  var ga = document.createElement('script'); " \
+    "ga.type = 'text/javascript'; ga.async = true;\n" \
+    "  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + " \
+    "'.google-analytics.com/ga.js';\n" \
+    "  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n" \
+    "  })();\n" \
+    "  </script>\n"
+
+
+# Files not referenced in any qdoc file.
+# See also extraimages.HTML
+qhp.QtCreator.extraFiles = 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 \
+                    images/qtcreator-screenshots.png \
+                    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
diff --git a/doc/config/qt-html-templates.qdocconf b/doc/config/qt-html-templates.qdocconf
new file mode 100644
index 00000000000..a08fbbcdc20
--- /dev/null
+++ b/doc/config/qt-html-templates.qdocconf
@@ -0,0 +1,56 @@
+include(qt-html-default-styles.qdocconf)
+
+HTML.postheader = \
+    "<div class=\"header\" id=\"qtdocheader\">\n" \
+    "  <div class=\"content\"> \n" \
+    "    <a href=\"index.html\" class=\"qtref\"><span>Qt Creator Documentation</span></a>\n" \
+    "  </div>\n" \
+    "  <div class=\"breadcrumb\">\n" \
+    "    <ul>\n" \
+    "      <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
+    "      <!--  Breadcrumbs go here -->\n"
+
+HTML.postpostheader = \
+    "\n" \
+    "    </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> 2008-2011 Nokia Corporation and/or its\n" \
+    "     subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+    "     in Finland and/or other countries worldwide.</p>\n" \
+    "  <p>\n" \
+    "     All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+    "     href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+    "  <br />\n" \
+    "  <p>\n" \
+    "    Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
+    "    Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
+    "    with the terms contained in a written agreement between you and Nokia.</p>\n" \
+    "  <p>\n" \
+    "    Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
+    "    Free Documentation License version 1.3</a>\n" \
+    "    as published by the Free Software Foundation.</p>\n" \
+    "</div>\n" \
+
+# Files not referenced in any qdoc file.
+# See also extraimages.HTML
+qhp.QtCreator.extraFiles = 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 \
+                           images/qtcreator-screenshots.png \
+                           style/offline.css
diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf
new file mode 100644
index 00000000000..dcd380e26de
--- /dev/null
+++ b/doc/config/qtcreator-project.qdocconf
@@ -0,0 +1,37 @@
+project     = "Qt Creator"
+description = "Qt Creator Manual"
+
+headerdirs = 
+sourcedirs = $SRCDIR
+imagedirs = $SRCDIR/images $SRCDIR/templates/images
+outputdir = $OUTDIR
+exampledirs = $SRCDIR
+indexes                 = qt.index
+
+include(compat.qdocconf)
+include(macros.qdocconf)
+include(qt-cpp-ignore.qdocconf)
+include(qt-defines.qdocconf)
+
+sources.fileextensions  = "qtcreator.qdoc maemodev.qdoc symbiandev.qdoc addressbook-sdk.qdoc"
+
+
+qhp.projects            = QtCreator
+qhp.QtCreator.file             = qtcreator.qhp
+qhp.QtCreator.namespace        = com.nokia.qtcreator.2095
+qhp.QtCreator.virtualFolder    = doc
+qhp.QtCreator.indexTitle       = Qt Creator
+qhp.QtCreator.filterAttributes = qtcreator 2.0.95
+qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.0.95
+qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.0.95
+qhp.QtCreator.indexRoot        =
+
+qhp.QtCreator.subprojects = manual
+qhp.QtCreator.subprojects.manual.title = Qt Creator Manual
+qhp.QtCreator.subprojects.manual.indexTitle = Qt Creator Manual
+qhp.QtCreator.subprojects.manual.type = manual
+
+# Doxygen compatibility commands
+
+macro.see                       = "\\sa"
+macro.function                  = "\\fn"
diff --git a/doc/doc.pri b/doc/doc.pri
index 605ae9192b0..15d623375a6 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -21,15 +21,19 @@ QCH_FILE = $$IDE_DOC_PATH/qtcreator.qch
 
 HELP_DEP_FILES = $$PWD/qtcreator.qdoc \
                  $$PWD/addressbook-sdk.qdoc \
-                 $$PWD/qt-defines.qdocconf \
-                 $$PWD/qt-html-templates.qdocconf \
+                 $$PWD/config/compat.qdocconf \
+                 $$PWD/config/macros.qdocconf \
+                 $$PWD/config/qt-cpp-ignore.qdocconf \
+                 $$PWD/config/qt-defines.qdocconf \
+                 $$PWD/config/qt-html-templates.qdocconf \
+                 $$PWD/config/qt-html-default-styles.qdocconf \
                  $$PWD/qtcreator.qdocconf
 
-html_docs.commands = $$QDOC -creator $$PWD/qtcreator.qdocconf
+html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
 html_docs.depends += $$HELP_DEP_FILES
 html_docs.files = $$QHP_FILE
 
-html_docs_online.commands = $$QDOC -online $$PWD/qtcreator.qdocconf
+html_docs_online.commands = $$QDOC $$PWD/qtcreator-online.qdocconf
 html_docs_online.depends += $$HELP_DEP_FILES
 
 qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE
diff --git a/doc/qt-defines.qdocconf b/doc/qt-defines.qdocconf
deleted file mode 100644
index 30d5c391533..00000000000
--- a/doc/qt-defines.qdocconf
+++ /dev/null
@@ -1,61 +0,0 @@
-defines                 = Q_QDOC \
-                          QT_.*_SUPPORT \
-                          QT_.*_LIB \
-                          QT_COMPAT \
-                          QT_KEYPAD_NAVIGATION \
-			  QT_NO_EGL \
-                          QT3_SUPPORT \
-                          Q_WS_.* \
-                          Q_OS_.* \
-                          Q_BYTE_ORDER \
-			  QT_DEPRECATED \
-                          Q_NO_USING_KEYWORD \
-                          __cplusplus \
-                          qtquick \
-                          qcmanual
-
-versionsym              = QT_VERSION_STR
-
-codeindent              = 1
-
-# Files not referenced in any qdoc file (last four needed by qtdemo)
-# See also qhp.Qt.extraFiles
-extraimages.HTML        = qt-logo \
-                          trolltech-logo \
-						 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 \
-						 qtcreator-screenshots.png
-
-# This stuff is used by the new doc format.
-scriptdirs              = $SRCDIR/templates/scripts
-styledirs               = $SRCDIR/templates/style
-
-scripts.HTML		= functions.js \
-			  narrow.js \
-			  superfish.js \
-			  jquery.js
-
-styles.HTML		= style.css \
-			  narrow.css \
-			  superfish.css \
-			  superfish_skin.css \
-			  style_ie6.css \
-			  style_ie7.css \
-			  style_ie8.css
diff --git a/doc/qt-html-templates.qdocconf b/doc/qt-html-templates.qdocconf
deleted file mode 100644
index 76dd43c4ef6..00000000000
--- a/doc/qt-html-templates.qdocconf
+++ /dev/null
@@ -1,147 +0,0 @@
-HTML.stylesheets        =  style/style.css \
-                           style/OfflineStyle.css \
-                           style/style_ie7.css \
-                           style/style_ie8.css \
-                           style/style_ie6.css
-
-HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
-			  "    <div class=\"content\"> \n" \
-			  "    <div id=\"nav-logo\">\n" \
-			  "      <a href=\"index.html\">Home</a></div>\n" \
-			  "    <a href=\"index.html\" class=\"qtref\"><span>Qt Creator Documentation</span></a>\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=\"index.html\">Qt Creator 2.1.81 </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=\"sidebar\">\n" \
-			  "        <div class=\"searchlabel\">\n" \
-			  "          Search index:</div>\n" \
-			  "        <div class=\"search\">\n" \
-			  "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
-			  "            <fieldset>\n" \
-			  "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
-			  "            </fieldset>\n" \
-			  "          </form>\n" \
-			  "        </div>\n" \
-			  "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
-			  "          <h2 title=\"API Lookup\"><span></span>\n" \
-			  "            API Lookup</h2>\n" \
-			  "          <div  id=\"list001\" class=\"list\">\n" \
-			  "          <ul id=\"ul001\" >\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/classes.html\">Class index</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/functions.html\">Function index</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/modules.html\">Modules</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/namespaces.html\">Namespaces</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/qtglobal.html\">Global Declarations</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/qdeclarativeelements.html\">QML elements</a></li>\n" \
-			  "            </ul> \n" \
-			  "          </div>\n" \
-			  "        </div>\n" \
-			  "        <div class=\"box bottombar\" id=\"topics\">\n" \
-			  "          <h2 title=\"Qt Topics\"><span></span>\n" \
-			  "            Qt Topics</h2>\n" \
-			  "          <div id=\"list002\" class=\"list\">\n" \
-			  "            <ul id=\"ul002\" >\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/qtquick.html\">Device UI's &amp; Qt Quick</a></li> \n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/platform-specific.html\">Platform-specific info</a></li> \n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/technology-apis.html\">Qt and Key Technologies</a></li> \n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/best-practices.html\">How-To's and Best Practices</a></li> \n" \
-			  "            </ul>  \n" \
-			  "          </div>\n" \
-			  "        </div>\n" \
-			  "        <div class=\"box\" id=\"examples\">\n" \
-			  "          <h2 title=\"Examples\"><span></span>\n" \
-			  "            Examples</h2>\n" \
-			  "          <div id=\"list003\" class=\"list\">\n" \
-			  "        <ul id=\"ul003\">\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/all-examples.html\">Examples</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/tutorials.html\">Tutorials</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/demos.html\">Demos</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/qdeclarativeexamples.html\">QML Examples</a></li>\n" \
-			  "            </ul> \n" \
-			  "          </div>\n" \
-			  "        </div>\n" \
-			  "      </div>\n" \
-			  "      <div class=\"wrap\">\n" \
-			  "        <div class=\"toolbar\">\n" \
-			  "          <div class=\"breadcrumb toolblock\">\n" \
-			  "            <ul>\n" \
-			  "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
-			  "              <!--  Bread crumbs goes 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\">\n"
-
-HTML.footer             = "" \
-			  "        <div class=\"feedback t_button\">\n" \
-			  "          [+] Documentation Feedback</div>\n" \
-			  "      </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> 2008-2011 Nokia Corporation and/or its\n" \
-			  "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
-			  "      in Finland and/or other countries worldwide.</p>\n" \
-			  "    <p>\n" \
-			  "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
-			  "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
-              "    <br />\n" \
-              "    <p>\n" \
-              "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
-              "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
-              "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
-              "    <p>\n" \
-              "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
-              "      Free Documentation License version 1.3</a>\n" \
-              "      as published by the Free Software Foundation.</p>\n" \
-			  "  </div>\n" \
-			  "  <div id=\"feedbackBox\">\n" \
-			  "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
-			  "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
-			  "      <p id=\"noteHead\">Thank you for giving your feedback.</p> <p class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \
-			  "      requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p>\n" \
-			  "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \
-			  "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
-			  "    </form>\n" \
-			  "  </div>\n" \
-			  "  <div id=\"blurpage\">\n" \
-			  "  </div>\n" 
\ No newline at end of file
diff --git a/doc/qtcreator-online.qdocconf b/doc/qtcreator-online.qdocconf
index adfa30760be..9219bf9ced7 100644
--- a/doc/qtcreator-online.qdocconf
+++ b/doc/qtcreator-online.qdocconf
@@ -1,4 +1,4 @@
-online                  = true
 # Run qdoc from the directory that contains this file.
-include(qtcreator.qdocconf)
+include(config/qtcreator-project.qdocconf)
+include(config/qt-html-templates-online.qdocconf)
 
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index ad11e687dd2..7977650144f 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -1232,7 +1232,7 @@
 
     The anchors for \gui{Rectangle 2} are specified as follows in code:
 
-    \code
+    \qml
     Rectangle {
         id: rectangle2
         anchors.right: rectangle3.left
@@ -1241,7 +1241,9 @@
         anchors.leftMargin: 15
         anchors.bottom: parent.bottom
         anchors.bottomMargin: 15
-    \endcode
+        // ...
+    }
+    \endqml
 
     Margins specify the amount of empty space to leave to the outside of an item.
     Margins only have meaning for anchors. They do not take any effect when using
@@ -5388,14 +5390,12 @@
             \o In the code editor, edit the pointer to the clicked expression in the mouse
             area element, as illustrated by the following code snippet:
 
-            \code
-
+            \qml
             MouseArea {
                 anchors.fill: parent
                 onClicked: page.state = ''
             }
-
-            \endcode
+            \endqml
 
             The expression sets the state to the base state and returns the image to
             its initial position.
@@ -5478,28 +5478,7 @@
         is scaled on different sizes of screens. Set expressions for the x and y
         properties, as illustrated by the following code snippet:
 
-        \code
-        states: [
-            State {
-                name: "State1"
-
-                PropertyChanges {
-                    target: icon
-                    x: middleRightRect.x
-                    y: middleRightRect.y
-                }
-            },
-            State {
-                name: "State2"
-
-                PropertyChanges {
-                    target: icon
-                    x: bottomLeftRect.x
-                    y: bottomLeftRect.y
-                }
-            }
-        ]
-        \endcode
+        \snippet snippets/qml/states-properties.qml states
 
         \image qmldesigner-tutorial-state1.png "States"
 
@@ -5525,18 +5504,7 @@
         State1, the x and y coordinates of the Qt logo change linearly over a duration
         of 1 second:
 
-        \code
-
-        transitions: [
-            Transition {
-                from: "*"; to: "State1"
-                NumberAnimation {
-                    properties: "x,y";
-                    duration: 1000
-                }
-            },
-
-        \endcode
+        \snippet snippets/qml/list-of-transitions.qml first transition
 
         \o You can use the Qt Quick toolbar for animation to change the easing curve
         type from linear to OutBounce:
@@ -5559,34 +5527,13 @@
         coordinates of the Qt logo change over a duration of 2 seconds,
         and an InOutQuad easing function is used:
 
-        \code
-
-        Transition {
-            from: "*"; to: "State2"
-            NumberAnimation {
-                properties: "x,y";
-                easing.type: Easing.InOutQuad;
-                duration: 2000
-            }
-        },
-
-        \endcode
+        \snippet snippets/qml/list-of-transitions.qml second transition
 
         \o Add the following code to specify that for any other state changes, the x
         and y coordinates of the Qt logo change linearly over a duration of 200
         milliseconds:
 
-        \code
-
-        Transition {
-            NumberAnimation {
-                properties: "x,y";
-                duration: 200
-            }
-        }
-        ]
-
-        \endcode
+        \snippet snippets/qml/list-of-transitions.qml default transition
 
         \o Press \key {Ctrl+R} to run the application in the QML Viewer.
 
@@ -8366,25 +8313,16 @@
         \o Replace the \gui Rectangle with an \gui Item, as illustrated by the
         following code snippet:
 
-        \code
-
+        \qml
         Item {
 
         }
-
-        \endcode
+        \endqml
 
         \o Specify properties and set expressions for the \gui Item, as
         illustrated by the following code snippet:
 
-        \code
-
-        property string text: ""
-        property int fontSize: 44
-
-        signal clicked
-
-        \endcode
+        \snippet snippets/qml/quick-scalable-image.qml properties and signal definitions
 
         You will point to the properties and expression later.
 
@@ -8593,13 +8531,11 @@
         editor to set the state of the root item of the .qml file, as specified by the
         following code snippet:
 
-        \code
-
+        \qml
         Item {
             state: "Normal"
         }
-
-        \endcode
+        \endqml
 
     \endlist
 
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf
index 1959c623e6c..7293bce9287 100644
--- a/doc/qtcreator.qdocconf
+++ b/doc/qtcreator.qdocconf
@@ -1,227 +1,3 @@
-
 # Run qdoc from the directory that contains this file.
-include(qt-html-templates.qdocconf)
-
-project     = qtcreator
-description = "Qt Creator Manual"
-
-headerdirs = 
-sourcedirs =
-sourcedirs = $SRCDIR
-imagedirs = $SRCDIR/images $SRCDIR/templates/images
-outputdir = $OUTDIR
-exampledirs = $SRCDIR
-indexes                 = qt.index
-
-include(qt-defines.qdocconf)
-
-sources.fileextensions  = "qtcreator.qdoc maemodev.qdoc symbiandev.qdoc addressbook-sdk.qdoc"
-
-
-qhp.projects            = QtCreator
-qhp.QtCreator.file             = qtcreator.qhp
-qhp.QtCreator.namespace        = com.nokia.qtcreator.$QTC_VERSION_TAG
-qhp.QtCreator.virtualFolder    = doc
-qhp.QtCreator.indexTitle       = Qt Creator
-qhp.QtCreator.filterAttributes = qtcreator $QTC_VERSION
-qhp.QtCreator.customFilters.QtCreator.name = Qt Creator $QTC_VERSION
-qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator $QTC_VERSION
-qhp.QtCreator.indexRoot        =
-qhp.QtCreator.extraFiles       = style/style.css \
-                          style/style_ie6.css \
-                          style/style_ie7.css \
-                          style/style_ie8.css \
-                          scripts/functions.js \
-                          scripts/jquery.js \
-						  scripts/narrow.js \
-						  scripts/superfish.js \
-						  style/narrow.css \
-						  style/superfish.css \
-                          images/qtcreator-screenshots.png \
-                          images/arrow_down.png \
-						  images/header_bg.png \
-                          images/bg_l.png \
-                          images/bg_r.png \
-                          images/bg_ul_blank.png \
-                          images/bg_ll_blank.png \
-                          images/bg_l_blank.png \
-                          images/breadcrumb.png \
-                          images/bullet_dn.png \
-						  images/bullet_up.png \
-                          images/bullet_gt.png \
-                          images/bullet_sq.png \
-                          images/box_bg.png \
-                          images/feedbackground.png \
-                          images/horBar.png \
-                          images/page_bg.png \
-                          images/page.png \
-                          images/qt-logo.png \
-						  images/spinner.gif \
-                          images/sprites-combined.png
-
-qhp.QtCreator.subprojects = manual
-qhp.QtCreator.subprojects.manual.title = Qt Creator Manual
-qhp.QtCreator.subprojects.manual.indexTitle = Qt Creator Manual
-qhp.QtCreator.subprojects.manual.type = manual
-
-# macros.qdocconf
-
-macro.qtcversion        = $QTC_VERSION
-
-macro.aring.HTML        = "&aring;"
-macro.Auml.HTML         = "&Auml;"
-macro.author            = "\\bold{Author:}"
-macro.br.HTML           = "<br />"
-macro.BR.HTML           = "<br />"
-macro.aacute.HTML       = "&aacute;"
-macro.eacute.HTML       = "&eacute;"
-macro.iacute.HTML       = "&iacute;"
-macro.gui               = "\\bold"
-macro.hr.HTML           = "<hr />"
-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.QC		= "\\e{Qt Creator}"
-macro.QMLD		= "\\e{Qt Quick Designer}"
-macro.QQV               = "\\e{Qt QML Viewer}"
-macro.QSDK              = "\\e{Qt SDK}"
-macro.param             = "\\e"
-macro.raisedaster.HTML  = "<sup>*</sup>"
-macro.reg.HTML          = "<sup>&reg;</sup>"
-macro.return            = "Returns"
-macro.starslash         = "\\c{*/}"
-macro.uuml.HTML         = "&uuml;"
-macro.mdash.HTML        = "&mdash;"
-
-# compat.qdocconf
-
-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"
-spurious			= "Missing comma in .*" \
-				  "Missing pattern .*"
-
-# Doxygen compatibility commands
-
-macro.see                       = "\\sa"
-macro.function                  = "\\fn"
-
-# qt-cpp-ignore.qdocconf
-
-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_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_EXPLICIT \
-                          Q_EXPORT \
-                          Q_EXPORT_CODECS_CN \
-                          Q_EXPORT_CODECS_JP \
-                          Q_EXPORT_CODECS_KR \
-                          Q_EXPORT_PLUGIN \
-                          Q_GFX_INLINE \
-                          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_NETWORK_EXPORT \
-                          Q_OPENGL_EXPORT \
-                          Q_OUTOFLINE_TEMPLATE \
-                          Q_SQL_EXPORT \
-                          Q_SVG_EXPORT \
-                          Q_SCRIPT_EXPORT \
-                          Q_TESTLIB_EXPORT \
-                          Q_TYPENAME \
-                          Q_XML_EXPORT \
-                          Q_XMLSTREAM_EXPORT \
-                          Q_XMLPATTERNS_EXPORT \
-                          QDBUS_EXPORT \
-                          QT_BEGIN_NAMESPACE \
-                          QT_BEGIN_INCLUDE_NAMESPACE \
-                          QT_END_NAMESPACE \
-                          QT_END_INCLUDE_NAMESPACE \
-                          PHONON_EXPORT \
-                          EXTENSIONSYSTEM_EXPORT
-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
-
-creator = true
+include(config/qtcreator-project.qdocconf)
+include(config/qt-html-templates.qdocconf)
diff --git a/doc/snippets/qml/list-of-transitions.qml b/doc/snippets/qml/list-of-transitions.qml
new file mode 100644
index 00000000000..cf4f9df6a60
--- /dev/null
+++ b/doc/snippets/qml/list-of-transitions.qml
@@ -0,0 +1,31 @@
+Item {
+    transitions: [
+    //! [first transition]
+        Transition {
+            from: "*"; to: "State1"
+            NumberAnimation {
+                properties: "x,y";
+                duration: 1000
+            }
+        },
+    //! [first transition]
+    //! [second transition]
+        Transition {
+            from: "*"; to: "State2"
+            NumberAnimation {
+                properties: "x,y";
+                easing.type: Easing.InOutQuad;
+                duration: 2000
+            }
+        },
+    //! [second transition]
+    //! [default transition]
+        Transition {
+            NumberAnimation {
+                properties: "x,y";
+                duration: 200
+            }
+        }
+    ]
+    //! [default transition]
+}
diff --git a/doc/snippets/qml/quick-scalable-image.qml b/doc/snippets/qml/quick-scalable-image.qml
new file mode 100644
index 00000000000..fe82b298f4d
--- /dev/null
+++ b/doc/snippets/qml/quick-scalable-image.qml
@@ -0,0 +1,8 @@
+Item {
+    //! [properties and signal definitions]
+    property string text: ""
+    property int fontSize: 44
+
+    signal clicked
+    //! [properties and signal definitions]
+}
diff --git a/doc/snippets/qml/states-properties.qml b/doc/snippets/qml/states-properties.qml
new file mode 100644
index 00000000000..b32f9eff186
--- /dev/null
+++ b/doc/snippets/qml/states-properties.qml
@@ -0,0 +1,24 @@
+Item {
+    //! [states]
+    states: [
+        State {
+            name: "State1"
+
+            PropertyChanges {
+                target: icon
+                x: middleRightRect.x
+                y: middleRightRect.y
+            }
+        },
+        State {
+            name: "State2"
+
+            PropertyChanges {
+                target: icon
+                x: bottomLeftRect.x
+                y: bottomLeftRect.y
+            }
+        }
+    ]
+    //! [states]
+}
diff --git a/doc/templates/style/offline.css b/doc/templates/style/offline.css
new file mode 100644
index 00000000000..ef5be92df75
--- /dev/null
+++ b/doc/templates/style/offline.css
@@ -0,0 +1,674 @@
+@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;
+        font-size: 11pt;
+        line-height: normal
+    }
+    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;
+    }
+    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: 130%
+    }
+
+    .content h2
+    {
+        font-weight: bold;
+        font-size: 120%;
+        width: 100%;
+    }
+    .content h3
+    {
+        font-weight: bold;
+        font-size: 110%;
+        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 */
diff --git a/doc/templates/style/style.css b/doc/templates/style/style.css
index 997e5f5dc8d..6a4e84ba023 100644
--- a/doc/templates/style/style.css
+++ b/doc/templates/style/style.css
@@ -2,7 +2,7 @@
 {
  
 /* basic elements */
- html
+    html
     {
         color: #000000;
         background: #FFFFFF;
@@ -20,7 +20,7 @@
     fieldset, img
     {
         border: 0;
-		max-width:100%;
+        max-width:100%;
     }
     address, caption, cite, code, dfn, em, strong, th, var, optgroup
     {
@@ -38,7 +38,7 @@
     ol li
     {
         list-style: decimal;
-    }	
+    }    
     caption, th
     {
         text-align: left;
@@ -60,10 +60,10 @@
     {
         vertical-align: baseline;
     }
-	tt, .qmlreadonly span, .qmldefault span
-	{
-		word-spacing:5px;
-	}
+    tt, .qmlreadonly span, .qmldefault span
+    {
+        word-spacing:5px;
+    }
     legend
     {
         color: #000000;
@@ -88,7 +88,7 @@
         font-style: italic;
     }
 
-	/* adding Qt theme */	
+    /* adding Qt theme */    
     html
     {
       /*  background-color: #e5e5e5;*/
@@ -117,9 +117,9 @@
     pre
     {
         border: 1px solid #DDDDDD;
-		-moz-border-radius: 7px 7px 7px 7px;
-		-webkit-border-radius: 7px 7px 7px 7px;
-		border-radius: 7px 7px 7px 7px;
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
         margin: 0 20px 10px 10px;
         padding: 20px 15px 20px 20px;
         overflow-x: auto;
@@ -135,14 +135,14 @@
         font-size: 11px;
         margin-bottom: 25px;
     }
-	pre.highlightedCode {
-		display: block;
-		overflow:hidden;
-	}	
+    pre.highlightedCode {
+        display: block;
+        overflow:hidden;
+    }    
     thead
     {
         margin-top: 5px;
-		font:600 12px/1.2 Arial;
+        font:600 12px/1.2 Arial;
     }
     th
     {
@@ -155,11 +155,11 @@
         padding: 3px 15px 3px 20px;
     }
     tr.odd td:hover,  tr.even td:hover    {}
-		
-	td.rightAlign
-	{
+        
+    td.rightAlign
+    {
         padding: 3px 5px 3px 10px;
-	}
+    }
     table tr.odd
     {
         border-left: 1px solid #E6E6E6;
@@ -176,7 +176,7 @@
     {
      /*   background-color: #E6E6E6;*/ /* disabled until further notice */
     }
-    		
+            
     span.comment
     {
         color: #8B0000;
@@ -227,7 +227,7 @@
         clear: both;
         visibility: hidden;
     }
-	
+    
 /* end global settings*/
 /* header elements */
     .header
@@ -267,7 +267,7 @@
         color: #4c0033;
         text-decoration: underline;
     }
-	
+    
     #nav-topright
     {
         height: 70px;
@@ -400,10 +400,10 @@
     {
         font-variant: normal;
     }
-	    .shortCut-topleft-inactive span a:hover,     .shortCut-topleft-active a:hover
-	{
-		text-decoration:none;
-	}
+        .shortCut-topleft-inactive span a:hover,     .shortCut-topleft-active a:hover
+    {
+        text-decoration:none;
+    }
     #shortCut
     {
         padding-top: 10px;
@@ -433,9 +433,9 @@
         color: #44a51c;
     }
 
-	
-	
-/* end header elements */	
+    
+    
+/* end header elements */    
 /* content and sidebar elements */
     .wrapper
     {
@@ -486,17 +486,17 @@
         background: url(../images/page.png) no-repeat 100% -60px;
         overflow: hidden;
     }
-	.navTop{ 
-	float:right;
-	display:block;
-	padding-right:15px;
+    .navTop{ 
+    float:right;
+    display:block;
+    padding-right:15px;
 
 
-	}
-	
+    }
+    
 
-	
-/* end content and sidebar elements */	
+    
+/* end content and sidebar elements */    
 /* sidebar elements */
     .sidebar
     {
@@ -525,9 +525,9 @@
     .sidebar .search form
     {
         background: url(../images/sprites-combined.png) no-repeat -6px -348px;
-		height:21px;
-		padding:2px 0 0 5px;
-		width:167px;
+        height:21px;
+        padding:2px 0 0 5px;
+        width:167px;
     }
 
     .sidebar .search form input#pageType
@@ -585,10 +585,10 @@
     .sidebar .box .list
     {
         display: block;
-		max-height:200px;
-		min-height:120px;
-		overflow-y:auto;
-		overflow-x:none;
+        max-height:200px;
+        min-height:120px;
+        overflow-y:auto;
+        overflow-x:none;
     }
     .list li a:hover
     {
@@ -596,9 +596,9 @@
     }
     .sidebar .box ul
     {
-	padding-bottom:5px;
-	padding-left:10px;
-	padding-top:5px;
+    padding-bottom:5px;
+    padding-left:10px;
+    padding-top:5px;
     }
     .sidebar .box ul li
     {
@@ -610,41 +610,41 @@
     {
         background: url(../images/box_bg.png) repeat-x 0 bottom;
     }
-	 .sidebar .box ul li.noMatch
+     .sidebar .box ul li.noMatch
     {
         background: none;
-		color:#FF2A00;
-		font-style:italic;
+        color:#FF2A00;
+        font-style:italic;
     }
-	 .sidebar .box ul li.hit
+     .sidebar .box ul li.hit
     {
         background: none;
-		color:#AAD2F0;
-		font-style:italic;
-    }	
-	.sidebar .search form input.loading
-	{
-			background:url("../images/spinner.gif") no-repeat scroll right center transparent;
-	}
+        color:#AAD2F0;
+        font-style:italic;
+    }    
+    .sidebar .search form input.loading
+    {
+            background:url("../images/spinner.gif") no-repeat scroll right center transparent;
+    }
 
 .floatingResult{
-	z-index:1;
-	position:relative;
-	padding-top:0px;
-	background-color:white;
-	border:solid 1px black;
-	height:250px;
-	width:600px;
-	overflow-x:hidden;
-	overflow-y:auto;
+    z-index:1;
+    position:relative;
+    padding-top:0px;
+    background-color:white;
+    border:solid 1px black;
+    height:250px;
+    width:600px;
+    overflow-x:hidden;
+    overflow-y:auto;
 }
 
-	.floatingResult:hover{
-		display:block;
-	}
-	.floatingResult:hover{
-	}
-	
+    .floatingResult:hover{
+        display:block;
+    }
+    .floatingResult:hover{
+    }
+    
 /* end sidebar elements */
 /* content elements */
     .wrap
@@ -745,7 +745,7 @@
     .wrap .content
     {
         padding: 30px;
-		word-wrap:break-word;
+        word-wrap:break-word;
     }
 
     .wrap .breadcrumb ul
@@ -777,29 +777,29 @@
 
 
 
-	.wrap .content ol li {
-	background:none;
-	font:normal 10pt/1.2 Verdana;
+    .wrap .content ol li {
+    background:none;
+    font:normal 10pt/1.2 Verdana;
 
-	margin-bottom:10px;
-	margin-left:12px;
-	/*list-style-type:disc;*/
-	}
-	
+    margin-bottom:10px;
+    margin-left:12px;
+    /*list-style-type:disc;*/
+    }
+    
     .wrap .content ol li
     {
-	background:none;
+    background:none;
     margin-bottom: 10px; 
-	padding-left:0px;
-	margin-left:52px;
+    padding-left:0px;
+    margin-left:52px;
     }
-	
+    
     .wrap .content li
     {
         background: url(../images/bullet_sq.png) no-repeat 0 5px;
         font: normal 400 10pt/1.2 Verdana;
         margin-bottom: 10px; 
-		padding-left:12px;
+        padding-left:12px;
     }
 
     .content li:hover  {}
@@ -810,17 +810,17 @@
     }
     .wrap .content h2
     {
-	border-bottom:1px solid #DDDDDD;
-	font:600 16px/1.2 Arial;
-	margin-top:15px;
-	width:100%;	
+    border-bottom:1px solid #DDDDDD;
+    font:600 16px/1.2 Arial;
+    margin-top:15px;
+    width:100%;    
     }
     .wrap .content h3
     {
         font: bold 14px/1.2 Arial;
-		font:600 16px/1.2 Arial;
-		margin-top:15px;
-		width:100%;		
+        font:600 16px/1.2 Arial;
+        margin-top:15px;
+        width:100%;        
     }
     .wrap .content p
     {
@@ -831,15 +831,15 @@
     {
         line-height: 20px;
       /*  padding: 0px;*/
-    }	
+    }    
     .wrap .content ul
     {
         padding-left: 25px;
         padding-top: 10px;
     }
-	.wrap .content ul img {
-		vertical-align:middle;
-	}	
+    .wrap .content ul img {
+        vertical-align:middle;
+    }    
     a:hover
     {
         color: #4c0033;
@@ -861,56 +861,56 @@
         color: #00732F;
         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;
+    .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-width:100%;
+    -webkit-column-width:200px;
+    -col-column-width:200px;
 */
-	column-gap:41px;
-	-webkit-column-gap:41px;
-	-moz-column-gap:41px;
+    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;
-	}	
+    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.2;
-	min-width:100%;
+    .flowList dl{
+    }
+    .flowList dd{
+    /*display:inline-block;*/
+    margin-left:10px;
+    min-width:250px;
+    line-height: 1.2;
+    min-width:100%;
 
-	}
-	
-	.flowList dd a{
-	}
+    }
+    
+    .flowList dd a{
+    }
 
-	.wrap .content .flowList p{
-	padding:0px;
-	}
+    .wrap .content .flowList p{
+    padding:0px;
+    }
 
     .content .alignedsummary
     {
@@ -978,25 +978,25 @@
         height: 120px;
         margin: 0px 25px 10px 15px;
     }
-	#noteHead
-	{
-		font-weight:bold;
-		padding:10px 10px 10px 20px;
-	}
+    #noteHead
+    {
+        font-weight:bold;
+        padding:10px 10px 10px 20px;
+    }
     #feedsubmit
     {
         display: inline;
         float: right;
         margin: 4px 32px 0 0;
     }
-	
-	.note
-	{
-		font-size:7pt;
-		padding-bottom:3px;
-		padding-left:20px;
-	}
-	
+    
+    .note
+    {
+        font-size:7pt;
+        padding-bottom:3px;
+        padding-left:20px;
+    }
+    
     #blurpage
     {
         display: none;
@@ -1028,67 +1028,67 @@
         font: bold 12px/1.2 Arial;
     }
 
-	.generic{
-	}
-	.generic td{
-	/*	padding:5px;*/
-	}
-	.generic .alphaChar{
-	margin-top:5px;
-	}
-	
-	.generic .odd .alphaChar{
+    .generic{
+    }
+    .generic td{
+    /*    padding:5px;*/
+    }
+    .generic .alphaChar{
+    margin-top:5px;
+    }
+    
+    .generic .odd .alphaChar{
         background-color: #F6F6F6;
-	}
-	
-	.generic .even .alphaChar{
+    }
+    
+    .generic .even .alphaChar{
         background-color: #FFFFFF;
-	}
+    }
 
-	.alignedsummary{}
-	.propsummary{}
-	.memItemLeft{}
-	.memItemRight{
-		padding:3px 15px 3px 0;
-	}
-	.bottomAlign{}
-	.highlightedCode
-	{
-	margin:10px;
-	}
-	.LegaleseLeft{}
-	.valuelist{}
-	.annotated td{
-	        padding: 3px 5px 3px 5px;
-	}
-	.obsolete{}
-	.compat{}
-	.flags{}
-	.qmlsummary{}
-	.qmlitem{}
-	.qmlproto{}
-	.qmlname{}
-	.qmlreadonly{}
-	.qmldefault{}
-	.qmldoc{}
-	.qt-style{}
-	.redFont{}
-	code{}
-	
+    .alignedsummary{}
+    .propsummary{}
+    .memItemLeft{}
+    .memItemRight{
+        padding:3px 15px 3px 0;
+    }
+    .bottomAlign{}
+    .highlightedCode
+    {
+    margin:10px;
+    }
+    .LegaleseLeft{}
+    .valuelist{}
+    .annotated td{
+            padding: 3px 5px 3px 5px;
+    }
+    .obsolete{}
+    .compat{}
+    .flags{}
+    .qmlsummary{}
+    .qmlitem{}
+    .qmlproto{}
+    .qmlname{}
+    .qmlreadonly{}
+    .qmldefault{}
+    .qmldoc{}
+    .qt-style{}
+    .redFont{}
+    code{}
+    
     .wrap .content .toc ul
     {
         padding-left: 0px;
     }
 
-	.wrap .content .toc h3{
-	border-bottom:0px;
-	margin-top:0px;
-	}	
-	
-	.wrap .content .toc h3  a:hover{
-	color:#00732F;
-	text-decoration:none;
-	}
+    .wrap .content .toc h3{
+    border-bottom:0px;
+    margin-top:0px;
+    }    
+    
+    .wrap .content .toc h3  a:hover{
+    color:#00732F;
+    text-decoration:none;
+    }
 
 
     .wrap .content .toc .level2
@@ -1126,22 +1126,22 @@
     }
     h3.fn, span.fn
     {
-		-moz-border-radius:7px 7px 7px 7px;
-		-webkit-border-radius:7px 7px 7px 7px;
-		border-radius:7px 7px 7px 7px;
+        -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;
+        word-spacing:3px;
+        padding:3px 5px;
     }
 
-	.functionIndex {
-	font-size:12pt;
-	word-spacing:10px;
-	margin-bottom:10px;
+    .functionIndex {
+    font-size:12pt;
+    word-spacing:10px;
+    margin-bottom:10px;
     background-color: #F6F6F6;
     border-width: 1px;
     border-style: solid;
@@ -1149,37 +1149,37 @@
     -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;	
-	}
+    width:100%;
+    }
+    
+    .centerAlign
+    {
+    text-align:center;    
+    }
+    
+    .rightAlign
+    {
+    text-align:right;    
+    }
 
-	
-	.leftAlign
-	{
-	text-align:left;	
-	}
+    
+    .leftAlign
+    {
+    text-align:left;    
+    }
 
-	.topAlign{
-	vertical-align:top
-	}
-	
-	.functionIndex a{
-	display:inline-block;
-	}
-	
+    .topAlign{
+    vertical-align:top
+    }
+    
+    .functionIndex a{
+    display:inline-block;
+    }
+    
 /* end content elements */
 /* footer elements */
 
-   .footer
+    .footer
     {
         min-height: 100px;
         color: #797775;
@@ -1198,7 +1198,7 @@
     .indexbox
     {
         width: 100%;
-		display:inline-block;
+        display:inline-block;
     }
 
     .indexboxcont
@@ -1247,8 +1247,8 @@
     .indexboxcont .sectionlist
     {
         display: inline-block;
-		vertical-align:top;
-		width: 32.5%;
+        vertical-align:top;
+        width: 32.5%;
         padding: 0;
     }
     .indexboxcont .sectionlist ul
@@ -1277,12 +1277,12 @@
         color: #00732f;
         text-decoration: none;
     }
-	
-	.indexbox .indexIcon {
-	width: 11%;
-	}
+    
+    .indexbox .indexIcon {
+    width: 11%;
+    }
 
-	
+    
     .indexbox .indexIcon span
     {
         display: block;
@@ -1311,56 +1311,56 @@
         clear: both;
         visibility: hidden;
     }
-	
+    
 
 
 /* start of creator spec*/
-	.creator
-	{
-	margin-left:0px;
-	margin-right:0px;
-	padding-left:0px;
-	padding-right:0px;
-	}
-	.creator .wrap .content ol li {
-	list-style-type:decimal;
-
-	}
-    .creator .header .icon,
-	.creator .feedback,
-	.creator .t_button,
-    .creator .feedback,
-	.creator #feedbackBox,
-	.creator #feedback,
-	.creator #blurpage,
-	/*.creator .indexbox .indexIcon span,*/
-	.creator .wrapper .hd,
-/*	.creator  .indexbox .indexIcon,*/
-	.creator .header #nav-logo,
-	.creator #offlinemenu,
-	.creator #offlinesearch,
-	.creator  .header #nav-topright,
-    .creator .header #shortCut ,
-	.creator .wrapper .hd,
-    .creator .wrapper .ft,
-	.creator .sidebar,
-	.creator .wrap .feedback
+    .creator
     {
-	display:none;
+    margin-left:0px;
+    margin-right:0px;
+    padding-left:0px;
+    padding-right:0px;
     }
-	
-	body.creator
+    .creator .wrap .content ol li {
+    list-style-type:decimal;
+
+    }
+    .creator .header .icon,
+    .creator .feedback,
+    .creator .t_button,
+    .creator .feedback,
+    .creator #feedbackBox,
+    .creator #feedback,
+    .creator #blurpage,
+    /*.creator .indexbox .indexIcon span,*/
+    .creator .wrapper .hd,
+/*    .creator  .indexbox .indexIcon,*/
+    .creator .header #nav-logo,
+    .creator #offlinemenu,
+    .creator #offlinesearch,
+    .creator  .header #nav-topright,
+    .creator .header #shortCut ,
+    .creator .wrapper .hd,
+    .creator .wrapper .ft,
+    .creator .sidebar,
+    .creator .wrap .feedback
     {
-	background: none;
+    display:none;
+    }
+    
+    body.creator
+    {
+    background: none;
 
         font: normal 13px/1.2 Verdana;
         color: #363534;
-		background-color: #FAFAFA;
+        background-color: #FAFAFA;
     }
 
-	.wrap .content ol li {
-	
-	}
+    .wrap .content ol li {
+    
+    }
 
 
     .creator .header, .footer, .wrapper
@@ -1369,19 +1369,19 @@
         margin: 0px;
     }
 
-   .creator .wrapper
+    .creator .wrapper
     {
-	position:relative;
-	top:5px;
+    position:relative;
+    top:5px;
     }
     .creator .wrapper .bd
-	{
+    {
 
-	background:#FFFFFF;
-	}
+    background:#FFFFFF;
+    }
 
 
-   .creator .header, .footer
+    .creator .header, .footer
     {
         display: block;
         clear: both;
@@ -1396,81 +1396,81 @@
 
     .creator .header .qtref span
     {
-		background:none;
-    }	
+        background:none;
+    }    
 
 
-	
-		.creator .footer
+    
+        .creator .footer
     {
-		border-top:1px solid #E5E5E5;
+        border-top:1px solid #E5E5E5;
         height: 50px;
-		margin:0px;
-		padding:10px;
+        margin:0px;
+        padding:10px;
     }
-	
-		.creator .footer p
-		{
-		text-align:justify;
-		max-width:900px;
+    
+        .creator .footer p
+        {
+        text-align:justify;
+        max-width:900px;
     }
-	    
+        
      .creator .wrap
     {
 
         padding:0 5px 0 5px;
-		margin: 0px;
+        margin: 0px;
     }
     .creator .wrap .toolbar
     {
 
 
-	border-bottom:1px solid #E5E5E5;
-	/*width:100%;*/
-	margin-left:-5px;
-	margin-right:-5px;
-    }	
+    border-bottom:1px solid #E5E5E5;
+    /*width:100%;*/
+    margin-left:-5px;
+    margin-right:-5px;
+    }    
     .creator .wrap .breadcrumb ul li a
     {
       /*  color: #363534;*/
         color: #00732F;
-    }	
-	
+    }    
+    
     .creator .wrap .content
     {
         padding: 0px;
-		word-wrap:break-word;
+        word-wrap:break-word;
     }
-	
+    
     .creator .wrap .content ol li { 
         background:none; 
         font: inherit; 
         padding-left: 0px;
     } 
-	
+    
     .creator .wrap .content .descr ol li {
-	margin-left: 45px;
+    margin-left: 45px;
 
     }
     .creator .content .alignedsummary
     {
         margin: 5px;
-		width:100%;
+        width:100%;
+    }
+    .creator .generic{
+        max-width:75%;
+    }
+    .creator .generic td{
+    /*    padding:0;*/
     }
-	.creator .generic{
-		max-width:75%;
-	}
-	.creator .generic td{
-	/*	padding:0;*/
-	}
     .creator .indexboxbar
     {
-		border-bottom:1px solid #E5E5E5;
+        border-bottom:1px solid #E5E5E5;
         margin-bottom: 25px;
-		background: none;
+        background: none;
     }
-	
-	
+    
+    
 
     .creator .header
     {
@@ -1480,8 +1480,8 @@
       background-color: #ffffff;
       padding: 10px 0 5px 0;
       overflow: visible;
-	  border-bottom: solid #E5E5E5 1px;
-	  z-index:1;
+      border-bottom: solid #E5E5E5 1px;
+      z-index:1;
 
 
 
@@ -1490,7 +1490,7 @@
 
 
 
-	/*  position:fixed;*/
+    /*  position:fixed;*/
     }
 
 
@@ -1509,17 +1509,17 @@
     .creator .header .qtref:visited
     {
       color: #00732F;
-	  }
+      }
     .creator .header .qtref:hover
     {
       color: #00732F;
-	  text-decoration:none;
-	  }
+      text-decoration:none;
+      }
     .creator .header .qtref span
     {
       background-image: none;
       text-indent: 0;
-	  text-decoration:none;
+      text-decoration:none;
     }
 
 
@@ -1530,7 +1530,7 @@
     .creator .wrap .toolbar
     {
       display:block;
-	  padding-top:0px;
+      padding-top:0px;
     }
 
 
@@ -1547,27 +1547,27 @@
       /*color: #363534;*/
     }
     
-	.creator #narrowmenu ul
-	{
-	  border-bottom:solid 1px #E5E5E5;
-	  border-left:solid 1px #E5E5E5;
-	  border-right:solid 1px #E5E5E5;
-	}
+    .creator #narrowmenu ul
+    {
+      border-bottom:solid 1px #E5E5E5;
+      border-left:solid 1px #E5E5E5;
+      border-right:solid 1px #E5E5E5;
+    }
 
     .creator #narrowmenu li ul {
       margin-top:-15px;
    }
 
 
-	.creator .toc {
-	margin:10px 20px 10px 10px;
-	}	
-	
-	.creator #narrowsearch, .creator #narrowmenu{
-		display:none;
-	}
+    .creator .toc {
+    margin:10px 20px 10px 10px;
+    }    
+    
+    .creator #narrowsearch, .creator #narrowmenu{
+        display:none;
+    }
 /* end of creator spec*/
-	
+    
 }
 
 /* end of screen media */
@@ -1585,8 +1585,8 @@
     {
         background: none;
         display: block;
-		width: 100%; margin: 0; float: none;
-		
+        width: 100%; margin: 0; float: none;
+        
     }
 }
 /* end of print media */
diff --git a/doc/templates/style/superfish.css b/doc/templates/style/superfish.css
index 0cf0f7dc960..2bdaef4d9c0 100644
--- a/doc/templates/style/superfish.css
+++ b/doc/templates/style/superfish.css
@@ -1,51 +1,51 @@
 .sf-menu, .sf-menu * {
-	margin:			0;
-	padding:		0;
-	list-style:		none;
+  margin: 0;
+  padding: 0;
+  list-style: none;
 }
 .sf-menu {
-	line-height:	1.0;
+  line-height: 1.0;
 }
 .sf-menu ul {
-	position:		absolute;
-	top:			-999em;
-	width:			10em; /* left offset of submenus need to match (see below) */
+  position: absolute;
+  top: -999em;
+  width: 10em; /* left offset of submenus need to match (see below) */
 }
 .sf-menu ul li {
-	width:			100%;
+  width: 100%;
 }
 .sf-menu li:hover {
-	visibility:		inherit; /* fixes IE7 'sticky bug' */
+  visibility: inherit; /* fixes IE7 'sticky bug' */
 }
 .sf-menu li {
-	float:			left;
-	position:		relative;
+  float: left;
+  position: relative;
 }
 .sf-menu a {
-	display:		block;
-	position:		relative;
+  display: block;
+  position: relative;
 }
 .sf-menu li:hover ul,
 .sf-menu li.sfHover ul {
-	left:			0;
-	top:			2.5em; /* match top ul list item height */
-	z-index:		99;
+  left: 0;
+  top: 2.5em; /* match top ul list item height */
+  z-index: 99;
 }
 ul.sf-menu li:hover li ul,
 ul.sf-menu li.sfHover li ul {
-	top:			-999em;
+  top: -999em;
 }
 ul.sf-menu li li:hover ul,
 ul.sf-menu li li.sfHover ul {
-	left:			10em; /* match ul width */
-	top:			0;
+  left: 10em; /* match ul width */
+  top: 0;
 }
 ul.sf-menu li li:hover li ul,
 ul.sf-menu li li.sfHover li ul {
-	top:			-999em;
+  top: -999em;
 }
 ul.sf-menu li li li:hover ul,
 ul.sf-menu li li li.sfHover ul {
-	left:			10em; /* match ul width */
-	top:			0;
+  left: 10em; /* match ul width */
+  top: 0;
 }