Fix the documentation to build again

- Switch to Qt 4.7.4/4.8 compatible style (from Qt Creator)
- add make docs target directly to the installerfw.pro file
- subsequently remove doc.pro (which was wrong to begin with)

Change-Id: I3bfdd18780074df9566217fb4c0029fd122c14f0
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

39 files changed, 2159 insertions, 2148 deletions

diff --git a/doc/classic.css b/doc/classic.css
deleted file mode 100644
index f97bdbeab..000000000
--- a/doc/classic.css
+++ /dev/null
@@ -1,295 +0,0 @@
-BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {
-  font-family: Arial, Geneva, Helvetica, sans-serif;
-}
-H1 {
-  text-align: center;
-  font-size: 160%;
-}
-H2 {
-  font-size: 120%;
-}
-H3 {
-  font-size: 100%;
-}
-
-h3.fn,span.fn
-{
-  background-color: #eee;
-  border-width: 1px;
-  border-style: solid;
-  border-color: #ddd;
-  font-weight: bold;
-  padding: 6px 0px 6px 10px;
-  margin: 42px 0px 0px 0px;
-}
-
-hr {
-  border: 0;
-  color: #a0a0a0;
-  background-color: #ccc;
-  height: 1px;
-  width: 100%;
-  text-align: left;
-  margin: 34px 0px 34px 0px;
-}
-
-table.valuelist {
-	border-width: 1px 1px 1px 1px;
-	border-style: solid;
-	border-color: #dddddd;
-	border-collapse: collapse;
-	background-color: #f0f0f0;
-}
-
-table.indextable {
-	border-width: 1px 1px 1px 1px;
-	border-collapse: collapse;
-	background-color: #f0f0f0;
-    border-color:#555;
-    font-size: 110%;
-}
-
-table td.largeindex {
-	border-width: 1px 1px 1px 1px;
-	border-collapse: collapse;
-	background-color: #f0f0f0;
-    border-color:#555;
-    font-size: 120%;
-}
-
-table.valuelist th {
-	border-width: 1px 1px 1px 2px;
-	padding: 4px;
-	border-style: solid;
-	border-color: #666;
-    color:white;
-    background-color:#666;
-}
-
-th.titleheader  {
-	border-width: 1px 0px 1px 0px;
-	padding: 4px;
-	border-style: solid;
-	border-color: #444;
-    color:white;
-    background-color:#555555;
-    font-size: 110%;
-}
-
-th.largeheader {
-	border-width: 1px 0px 1px 0px;
-	padding: 4px;
-	border-style: solid;
-	border-color: #444;
-    color:white;
-    background-color:#555555;
-    font-size: 120%;
-}
-
-p {
-
-  margin-left: 4px;
-  margin-top: 8px;
-  margin-bottom: 8px;
-}
-
-a:link
-{
-  color: #0046ad;
-  text-decoration: none
-}
-
-a:visited
-{
-  color: #672967;
-  text-decoration: none
-}
-
-a.obsolete
-{
-  color: #661100;
-  text-decoration: none
-}
-
-a.compat
-{
-  color: #661100;
-  text-decoration: none
-}
-
-a.obsolete:visited
-{
-  color: #995500;
-  text-decoration: none
-}
-
-a.compat:visited
-{
-  color: #995500;
-  text-decoration: none
-}
-
-body
-{
-  background: #ffffff;
-  color: black
-}
-
-table.generic, table.annotated
-{
-  border-width: 1px;
-  border-color:#bbb;
-  border-style:solid;  
-  border-collapse:collapse;
-}
-
-table td.memItemLeft {
-  width: 180px;
-  padding: 2px 0px 0px 8px;
-  margin: 4px;
-  border-width: 1px;
-  border-color: #E0E0E0;
-  border-style: none;
-  font-size: 100%;
-  white-space: nowrap
-}
-
-table td.memItemRight {
-  padding: 2px 8px 0px 8px;
-  margin: 4px;
-  border-width: 1px;
-  border-color: #E0E0E0;
-  border-style: none;
-  font-size: 100%;
-}
-
-table tr.odd {
-  background: #f0f0f0;
-  color: black;
-}
-
-table tr.even {
-  background: #e4e4e4;
-  color: black;
-}
-
-table.annotated th {
-  padding: 3px;
-  text-align: left
-}
-
-table.annotated td {
-  padding: 3px;
-}
-
-table tr pre
-{
-  padding-top: 0px;
-  padding-bottom: 0px;
-  padding-left: 0px;
-  padding-right: 0px;
-  border: none;
-  background: none
-}
-
-tr.qt-style
-{
-  background: #96E066;
-  color: black
-}
-
-body pre
-{
-  padding: 0.2em;
-  border: #e7e7e7 1px solid;
-  background: #f1f1f1;
-  color: black
-}
-
-table tr.qt-code pre
-{
-  padding: 0.2em;
-  border: #e7e7e7 1px solid;
-  background: #f1f1f1;
-  color: black
-}
-
-span.preprocessor, span.preprocessor a
-{
-  color: darkblue;
-}
-
-span.comment
-{
-  color: darkred;
-  font-style: italic
-}
-
-span.string,span.char
-{
-  color: darkgreen;
-}
-
-.title
-{
-    text-align: center
-}
-
-.subtitle
-{
-    font-size: 0.8em
-}
-
-.small-subtitle
-{
-    font-size: 0.65em
-}
-
-.qmlitem {
-    padding: 0;
-}
-
-.qmlname {
-    white-space: nowrap;
-    font-weight: bold;
-    font-size: 125%;
-}
-
-.qmltype {
-    font-weight: bold;
-    font-size: 125%;
-}
-
-.qmlproto, .qmldoc {
-   // border-top: 1px solid #84b0c7;
-}
-
-.qmlproto {
-    padding: 0;
-    //background-color: #e4e4e4;//#d5e1e8;
-    //font-weight: bold;
-    //-webkit-border-top-left-radius: 8px;
-    //-webkit-border-top-right-radius: 8px;
-    //-moz-border-radius-topleft: 8px;
-    //-moz-border-radius-topright: 8px;
-}
-
-.qmldoc {
-    border-top: 1px solid #e4e4e4;
-    //padding: 2px 5px;
-    //background-color: #eef3f5;
-    //border-top-width: 0;
-    //-webkit-border-bottom-left-radius: 8px;
-    //-webkit-border-bottom-right-radius: 8px;
-    //-moz-border-radius-bottomleft: 8px;
-    //-moz-border-radius-bottomright: 8px;
-}
-
-.qmldoc p, .qmldoc dl, .qmldoc ul {
-    //margin: 6px 0;
-}
-
-*.qmlitem p {
-    //margin-top: 0px;
-    //margin-bottom: 0px;
-}
diff --git a/doc/config/compat.qdocconf b/doc/config/compat.qdocconf
new file mode 100644
index 000000000..5745ed93b
--- /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 000000000..568191eec
--- /dev/null
+++ b/doc/config/macros.qdocconf
@@ -0,0 +1,41 @@
+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                = "Qt Assistant"
+macro.QC                = "Qt Creator"
+macro.QD                = "Qt Designer"
+macro.QL                = "Qt Linguist"
+macro.QMLD              = "Qt Quick Designer"
+macro.QQV               = "Qt QML Viewer"
+macro.QS                = "Qt Simulator"
+macro.QSDK              = "Qt SDK"
+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 000000000..ce8de2406
--- /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 000000000..1ce9a8045
--- /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 000000000..a2a918bd6
--- /dev/null
+++ b/doc/config/qt-html-default-styles.qdocconf
@@ -0,0 +1,41 @@
+# 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 \
+                          bgrContent.png \
+                          blu_dot.png \
+                          btn_next.png \
+                          btn_prev.png \
+                          ico_note.png \
+                          ico_note_attention.png \
+                          ico_out.png \
+                          arrow.png \
+                          home.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 000000000..48a1f3d94
--- /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 = $SRCDIR/templates
+
+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 000000000..85df93cf5
--- /dev/null
+++ b/doc/config/qt-html-templates-online.qdocconf
@@ -0,0 +1,171 @@
+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 Creator Manual</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 Creator</a></span></li>\n" \
+    "        </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=\"box first bottombar\" id=\"lookup\">\n" \
+    "          <h2 title=\"API Lookup\">\n" \
+    "            API Lookup</h2>\n" \
+    "          <div  id=\"list001\" class=\"list\">\n" \
+    "          <ul id=\"ul001\" >\n" \
+    "              <li><a href="http://doc.qt.nokia.com/4.7/classes.html">Class index</a></li>\n" \
+    "              <li><a href="http://doc.qt.nokia.com/4.7/functions.html">Function index</a></li>\n" \
+    "              <li><a href="http://doc.qt.nokia.com/4.7/modules.html">Modules</a></li>\n" \
+    "              <li><a href="http://doc.qt.nokia.com/4.7/namespaces.html">Namespaces</a></li>\n" \
+    "              <li><a href="http://doc.qt.nokia.com/4.7/qtglobal.html">Global Declarations</a></li>\n" \
+    "              <li><a href="http://doc.qt.nokia.com/4.7/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><a href="http://doc.qt.nokia.com/4.7/qt-basic-concepts.html">Programming with Qt</a></li> \n" \
+    "               <li><a href="http://doc.qt.nokia.com/4.7/qtquick.html">Device UIs &amp; Qt Quick</a></li> \n" \
+    "               <li><a href="http://doc.qt.nokia.com/4.7/qt-gui-concepts.html">UI Design with Qt</a></li> \n" \
+    "               <li><a href="http://doc.qt.nokia.com/4.7/developing-with-qt.html">Cross-platform and Platform-specific</a></li> \n" \
+    "               <li><a href="http://doc.qt.nokia.com/4.7/platform-specific.html">Platform-specific info</a></li> \n" \
+    "               <li><a href="http://doc.qt.nokia.com/4.7/technology-apis.html">Qt and Key Technologies</a></li> \n" \
+    "               <li><a href="http://doc.qt.nokia.com/4.7/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><a href="http://doc.qt.nokia.com/4.7/all-examples.html">Examples</a></li>\n" \
+    "              <li><a href="http://doc.qt.nokia.com/4.7/tutorials.html">Tutorials</a></li>\n" \
+    "              <li><a href="http://doc.qt.nokia.com/4.7/demos.html">Demos</a></li>\n" \
+    "              <li><a href="http://doc.qt.nokia.com/4.7/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>\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" \
+    "\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 \
+                    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 000000000..36c6c5e5f
--- /dev/null
+++ b/doc/config/qt-html-templates.qdocconf
@@ -0,0 +1,64 @@
+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 Installer Framework 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/bgrContent.png \
+                           images/blu_dot.png \
+                           images/btn_next.png \
+                           images/btn_prev.png \
+                           images/ico_note.png \
+                           images/ico_note_attention.png \
+                           images/ico_out.png \
+                           images/home.png \
+                           images/arrow.png \
+                           style/offline.css
diff --git a/doc/doc.intermediate.manifest b/doc/doc.intermediate.manifest
deleted file mode 100644
index 27087c685..000000000
--- a/doc/doc.intermediate.manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level='asInvoker' uiAccess='false' />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*' />
-    </dependentAssembly>
-  </dependency>
-</assembly>
diff --git a/doc/doc.pro b/doc/doc.pro
deleted file mode 100644
index 3f6993ba8..000000000
--- a/doc/doc.pro
+++ /dev/null
@@ -1 +0,0 @@
-include (doc.pri)
diff --git a/doc/installerfw.qdocconf b/doc/installerfw.qdocconf
index 8bc6fb70d..943f11546 100644
--- a/doc/installerfw.qdocconf
+++ b/doc/installerfw.qdocconf
@@ -1,14 +1,6 @@
-# Run qdoc from the directory that contains this file.
-include(qt-html-templates.qdocconf)
-
-project     = installerfw
+project     = "installerfw"
 description = "Qt Installer Framework Manual"
 
-headers =
-#    $$SIMULATOR_DEPENDENCY_PATH/include/remotecontrolwidget/locationui.h
-sources =
-#    $$SRCDIR/../src/ui/sensorsui.cpp \
-
 headerdirs =
 sourcedirs = $SRCDIR
 imagedirs = $SRCDIR/images $SRCDIR/templates/images
@@ -16,216 +8,30 @@ outputdir = $OUTDIR
 exampledirs = $SRCDIR
 indexes                 = qt.index
 
-include(qt-defines.qdocconf)
-
-sources.fileextensions  = "installerfw.qdoc scripting.qdoc tutorial.qdoc noninteractive.qdoc operations.qdoc"
+include(config/qt-html-templates.qdocconf)
+include(config/compat.qdocconf)
+include(config/macros.qdocconf)
+include(config/qt-cpp-ignore.qdocconf)
+include(config/qt-defines.qdocconf)
 
+sources.fileextensions         = "*.qdoc"
 
 qhp.projects            = InstallerFramework
 qhp.InstallerFramework.file             = installerfw.qhp
 qhp.InstallerFramework.namespace        = com.nokia.qt.installerfw.121
 qhp.InstallerFramework.virtualFolder    = doc
 qhp.InstallerFramework.indexTitle       = Qt Installer Framework Manual
-qhp.InstallerFramework.indexRoot        =
-qhp.InstallerFramework.filterAttributes = installerfw
-qhp.InstallerFramework.customFilters.InstallerFramework.name = Qt Installer Framework 1.2.1
+qhp.InstallerFramework.filterAttributes = installerfw 121
+qhp.InstallerFramework.customFilters.InstallerFramework.name = Installer Framework
 qhp.InstallerFramework.customFilters.InstallerFramework.filterAttributes = installerfw
+qhp.InstallerFramework.indexRoot        =
 
-qhp.InstallerFramework.subprojects         = scripting manual
-qhp.InstallerFramework.subprojects.scripting.title = Scripting
-qhp.InstallerFramework.subprojects.scripting.indexTitle = Installer Framework Scripting
-qhp.InstallerFramework.subprojects.scripting.selectors = class
-qhp.InstallerFramework.subprojects.scripting.sortPages = true
-
-
+qhp.InstallerFramework.subprojects = manual
 qhp.InstallerFramework.subprojects.manual.title = Qt Installer Framework Manual
 qhp.InstallerFramework.subprojects.manual.indexTitle = Qt Installer Framework Manual
 qhp.InstallerFramework.subprojects.manual.type = manual
 
-qhp.InstallerFramework.extraFiles       = \
-                          style/OfflineStyle.css \
-                          style/style.css \
-                          style/style_ie6.css \
-                          style/style_ie7.css \
-                          style/style_ie8.css \
-                          images/qt-logo.png \
-                          scripts/functions.js \
-                          scripts/jquery.js \
-						  images/qt-logo \
-                          images/trolltech-logo \
-                          images/api_examples.png \
-                          images/api_lookup.png \
-                          images/arrow_down.png \
-                          images/bg_ll.png \
-                          images/bg_l.png \
-                          images/bg_lr.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_gt.png \
-                          images/bullet_sq.png \
-                          images/box_bg.png \
-                          images/feedbackground.png \
-                          images/horBar.png \
-                          images/page_bg.png \
-						  images/page.png \
-                          images/sprites-combined.png \
-                          images/bullet_up.png
-# macros.qdocconf
-
-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.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 \
-                          Q_INVOKABLE
-Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
-                          Q_DECLARE_INTERFACE \
-                          Q_DECLARE_METATYPE \
-                          Q_DECLARE_OPERATORS_FOR_FLAGS \
-                          Q_DECLARE_PRIVATE \
-                          Q_DECLARE_PUBLIC \
-                          Q_DECLARE_SHARED \
-                          Q_DECLARE_TR_FUNCTIONS \
-                          Q_DECLARE_TYPEINFO \
-                          Q_DISABLE_COPY \
-                          QT_FORWARD_DECLARE_CLASS \
-                          Q_DUMMY_COMPARISON_OPERATOR \
-                          Q_ENUMS \
-                          Q_FLAGS \
-                          Q_INTERFACES \
-                          __attribute__ \
-                          K_DECLARE_PRIVATE \
-                          PHONON_OBJECT \
-                          PHONON_HEIR
-
diff --git a/doc/qt-defines.qdocconf b/doc/qt-defines.qdocconf
deleted file mode 100644
index a6b4c8d26..000000000
--- a/doc/qt-defines.qdocconf
+++ /dev/null
@@ -1,66 +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
-
-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 \
-                          api_examples.png \
-                          api_lookup.png \
-                          arrow_down.png \
-                          bg_ll.png \
-                          bg_l.png \
-                          bg_lr.png \
-                          bg_r.png \
-                          bg_ul_blank.png \
-                          bg_ll_blank.png \
-                          bg_l_blank.png \
-                          breadcrumb.png \
-                          bullet_dn.png \
-                          bullet_gt.png \
-                          bullet_sq.png \
-                          box_bg.png \
-                          feedbackground.png \
-                          horBar.png \
-                          page_bg.png \
-                          page.png \
-                          sprites-combined.png \
-                          qtcreator-screenshots.png
-
-# This stuff is used by the new doc format.
-scriptdirs              = $SRCDIR/templates/scripts
-styledirs               = $SRCDIR/templates/style
-
-scripts.HTML		= functions.js \
-			  shBrushCpp.js \
-			  shCore.js \
-			  shLegacy.js \
-			  narrow.js \
-			  superfish.js \
-			  jquery.js
-
-styles.HTML		= style.css \
-			  shCore.css \
-			  shThemeDefault.css \
-			  narrow.css \
-			  superfish.css \
-			  superfish_skin.css \
-			  OfflineStyle.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 a24d502c4..000000000
--- a/doc/qt-html-templates.qdocconf
+++ /dev/null
@@ -1,149 +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 Installer Framework Manual</span></a>\n" \
-			  "		<div id=\"narrowsearch\"><form onsubmit=\"return false;\" action=\"\" id=\"qtdocsearch\">\n" \
-			  "		<fieldset>\n" \
-              "		<input type=\"text\" value=\"\" id=\"pageType\" name=\"searchstring\">\n" \
-			  "		 </fieldset>\n" \
-			  "		</form></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://qt.nokia.com/developer\">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" \
-			  "        <li class=\"nav-topright-shop\"><a title=\"SHOP\" href=\"http://shop.qt.nokia.com\">SHOP</a></li>\n" \
-			  "      </ul>\n" \
-			  "    </div>\n" \
-			  "    <div id=\"shortCut\">\n" \
-			  "      <ul>\n" \
-                          "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt Installer Framework 1.2.0</a></span></li>\n" \
-			  "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">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/latest/classes.html\">Class index</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/functions.html\">Function index</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/modules.html\">Modules</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/namespaces.html\">Namespaces</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qtglobal.html\">Global stuff</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/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/latest/qt-basic-concepts.html\">Basic Qt architecture</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/declarativeui.html\">Device UI's &amp; Qt Quick</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qt-gui-concepts.html\">Desktop UI components</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/platform-specific.html\">Platform-specific info</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/latest/all-examples.html\">Examples</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/tutorials.html\">Tutorials</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/demos.html\">Demos</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qdeclarativeexamples.html\">QML Examples</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qdeclarativeexamples.html#Demos\">QML Demos</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 -->\n" \
-			  "        <div class=\"feedback t_button\">\n" \
-			  "          [+] Documentation Feedback</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-2010 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" \
-			  "  </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><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit you feedback...</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" \
-			  "<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"
diff --git a/doc/templates/images/arrow.png b/doc/templates/images/arrow.png
new file mode 100644
index 000000000..f2a83a574
--- /dev/null
+++ b/doc/templates/images/arrow.png
diff --git a/doc/templates/images/bg_l.png b/doc/templates/images/bg_l.png
index 95470c78c..90b1da10b 100644
--- a/doc/templates/images/bg_l.png
+++ b/doc/templates/images/bg_l.png
diff --git a/doc/templates/images/bg_l_blank.png b/doc/templates/images/bg_l_blank.png
index e0eca3f1c..5a9673d81 100644
--- a/doc/templates/images/bg_l_blank.png
+++ b/doc/templates/images/bg_l_blank.png
diff --git a/doc/templates/images/bg_r.png b/doc/templates/images/bg_r.png
index 42a35a546..f0fb121de 100644
--- a/doc/templates/images/bg_r.png
+++ b/doc/templates/images/bg_r.png
diff --git a/doc/templates/images/bgrContent.png b/doc/templates/images/bgrContent.png
new file mode 100644
index 000000000..1a81b0308
--- /dev/null
+++ b/doc/templates/images/bgrContent.png
diff --git a/doc/templates/images/blu_dot.png b/doc/templates/images/blu_dot.png
new file mode 100644
index 000000000..c332148f7
--- /dev/null
+++ b/doc/templates/images/blu_dot.png
diff --git a/doc/templates/images/box_bg.png b/doc/templates/images/box_bg.png
index 232655a81..3322f923f 100644
--- a/doc/templates/images/box_bg.png
+++ b/doc/templates/images/box_bg.png
diff --git a/doc/templates/images/breadcrumb.png b/doc/templates/images/breadcrumb.png
index f0571ce1b..0ded5514d 100644
--- a/doc/templates/images/breadcrumb.png
+++ b/doc/templates/images/breadcrumb.png
diff --git a/doc/templates/images/btn_next.png b/doc/templates/images/btn_next.png
new file mode 100644
index 000000000..f7bc2b717
--- /dev/null
+++ b/doc/templates/images/btn_next.png
diff --git a/doc/templates/images/btn_prev.png b/doc/templates/images/btn_prev.png
new file mode 100644
index 000000000..10a620c51
--- /dev/null
+++ b/doc/templates/images/btn_prev.png
diff --git a/doc/templates/images/bullet_gt.png b/doc/templates/images/bullet_gt.png
index 88759256c..7561b4edc 100644
--- a/doc/templates/images/bullet_gt.png
+++ b/doc/templates/images/bullet_gt.png
diff --git a/doc/templates/images/bullet_sq.png b/doc/templates/images/bullet_sq.png
index db85ee340..a84845e3c 100644
--- a/doc/templates/images/bullet_sq.png
+++ b/doc/templates/images/bullet_sq.png
diff --git a/doc/templates/images/bullet_up.png b/doc/templates/images/bullet_up.png
index 285e7411b..7de2f0695 100644
--- a/doc/templates/images/bullet_up.png
+++ b/doc/templates/images/bullet_up.png
diff --git a/doc/templates/images/home.png b/doc/templates/images/home.png
new file mode 100644
index 000000000..8de6d0c81
--- /dev/null
+++ b/doc/templates/images/home.png
diff --git a/doc/templates/images/ico_note.png b/doc/templates/images/ico_note.png
new file mode 100644
index 000000000..13794046c
--- /dev/null
+++ b/doc/templates/images/ico_note.png
diff --git a/doc/templates/images/ico_note_attention.png b/doc/templates/images/ico_note_attention.png
new file mode 100644
index 000000000..b85b696b1
--- /dev/null
+++ b/doc/templates/images/ico_note_attention.png
diff --git a/doc/templates/images/ico_out.png b/doc/templates/images/ico_out.png
new file mode 100644
index 000000000..ff6e458fb
--- /dev/null
+++ b/doc/templates/images/ico_out.png
diff --git a/doc/templates/images/page_bg.png b/doc/templates/images/page_bg.png
index fb7d051a2..9b3bd999d 100644
--- a/doc/templates/images/page_bg.png
+++ b/doc/templates/images/page_bg.png
diff --git a/doc/templates/scripts/functions.js b/doc/templates/scripts/functions.js
index 58a024859..32cc901fe 100644
--- a/doc/templates/scripts/functions.js
+++ b/doc/templates/scripts/functions.js
@@ -63,11 +63,9 @@ function processNokiaData(response){
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage'){
 			lookupCount++;
 
-			
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
 				full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
 				full_li_element = full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd;
-					
 				$('#ul001').append(full_li_element);
 			$('#ul001 .defaultLink').css('display','none');
 
@@ -77,7 +75,6 @@ function processNokiaData(response){
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){
 			articleCount++;
 
-				 
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
 			    full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
 				full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
@@ -103,10 +100,13 @@ function processNokiaData(response){
 		if(i==propertyTags.length){$('#pageType').removeClass('loading');}
 
 	}	
+	if(lookupCount > 0){$('#ul001 .menuAlert').remove();$('#ul001').prepend('<li class=\"menuAlert liveResult hit\">Found ' + lookupCount + ' hits</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
+    if(articleCount > 0){$('#ul002 .menuAlert').remove();$('#ul002').prepend('<li class=\"menuAlert liveResult hit\">Found ' + articleCount + ' hits</li>');$('#ul002 li').css('display','block');}
+	if(exampleCount > 0){$('#ul003 .menuAlert').remove();$('#ul003').prepend('<li class=\"menuAlert liveResult hit\">Found ' + articleCount + ' hits</li>');$('#ul003 li').css('display','block');}
 	 
-	if(lookupCount == 0){$('#ul001').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
-    if(articleCount == 0){$('#ul002').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');}
-	if(exampleCount == 0){$('#ul003').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');}
+	if(lookupCount == 0){$('#ul001 .menuAlert').remove();$('#ul001').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
+    if(articleCount == 0){$('#ul002 .menuAlert').remove();$('#ul002').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');}
+	if(exampleCount == 0){$('#ul003 .menuAlert').remove();$('#ul003').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');}
 	// reset count variables;
 	 lookupCount=0;
 	 articleCount = 0;
@@ -117,12 +117,8 @@ function processNokiaData(response){
 var blankRE=/^\s*$/;
 function CheckEmptyAndLoadList()
 {
-	var pageUrl = window.location.href;
-	var pageVal = $('title').html();
 	$('#feedUrl').remove();
-	$('#pageVal').remove();
-	$('#feedform').append('<input id="feedUrl" name="feedUrl" value="'+pageUrl+'" style="display:none;">');
-	$('#feedform').append('<input id="pageVal" name="pageVal" value="'+pageVal+'" style="display:none;">');
+	$('.menuAlert').remove();
 	$('.liveResult').remove();
     $('.defaultLink').css('display','block');
 	var value = document.getElementById('pageType').value; 
@@ -160,7 +156,8 @@ else
           var searchString = $('#pageType').val() ;
           if ((searchString == null) || (searchString.length < 3)) {
 				$('#pageType').removeClass('loading');
-				 $('.liveResult').remove(); // replaces removeResults();
+				 $('.liveResult').remove(); 
+				 $('.searching').remove(); 
       	   		CheckEmptyAndLoadList();
 				$('.report').remove();
 				// debug$('.content').prepend('<li>too short or blank</li>'); // debug
@@ -169,9 +166,8 @@ else
             if (this.timer) clearTimeout(this.timer);
             this.timer = setTimeout(function () {
 				$('#pageType').addClass('loading');
-				// debug$('.content').prepend('<li>new search started </li>');// debug
-				// debug$('.content').prepend('<p class=\"report\">Search string ' +searchString +'</p>'); // debug
-
+				$('.searching').remove(); 
+				$('.list ul').prepend('<li class="menuAlert searching">Searching...</li>');
                $.ajax({
                 contentType: "application/x-www-form-urlencoded",
                 url: 'http://' + location.host + '/nokiasearch/GetDataServlet',
@@ -180,9 +176,10 @@ else
 				type: 'post',	 
                 success: function (response, textStatus) {
 
-				$('.liveResult').remove(); // replaces removeResults();
-								$('#pageType').removeClass('loading');
-
+				$('.liveResult').remove(); 
+				$('.searching').remove(); 
+				$('#pageType').removeClass('loading');
+				$('.list ul').prepend('<li class="menuAlert searching">Searching...</li>');
                 processNokiaData(response);
 
  }     
diff --git a/doc/templates/scripts/narrow.js b/doc/templates/scripts/narrow.js
index 12d0ce89d..35c81bf4a 100644
--- a/doc/templates/scripts/narrow.js
+++ b/doc/templates/scripts/narrow.js
@@ -59,9 +59,20 @@ var narrowInit = function() {
 }
 
 $(document).ready(function(){
-  if ($('body').hasClass('narrow')) {
+/*   if ($('body').hasClass('narrow')) {
     narrowInit();
   }
+ */
+ if($(window).width()<600) {
+    $('body').addClass('narrow');
+
+    if ($("#narrowsearch").length == 0) {
+      narrowInit();
+    }
+  }
+  else {
+    $('body').removeClass('narrow');
+  }
 });
 
 $(window).bind('resize', function () {
diff --git a/doc/templates/style/OfflineStyle.css b/doc/templates/style/OfflineStyle.css
deleted file mode 100644
index 51ea3541b..000000000
--- a/doc/templates/style/OfflineStyle.css
+++ /dev/null
@@ -1,836 +0,0 @@
-@media screen
-{
-    html
-    {
-        color: #000000;
-        background: #FFFFFF;
-    }
-    body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, textarea, p, blockquote, th, td
-    {
-        margin: 0;
-        padding: 0;
-    }
-    table
-    {
-        border-collapse: collapse;
-        border-spacing: 0;
-    }
-    fieldset, img
-    {
-        border: 0;
-    }
-    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;
-    }
-    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
-    {
-        vertical-align: baseline;
-    }
-    sub
-    {
-        vertical-align: baseline;
-    }
-	tt, .qmlreadonly span, .qmldefault span
-	{
-		word-spacing:5px;
-	}
-    .heading
-    {
-        font: normal 600 16px/1.0 Arial;
-    }
-    .subtitle
-    {
-        font-size: 13px;
-    }
-    .small-subtitle
-    {
-        font-size: 13px;
-    }
-    legend
-    {
-        color: #000000;
-    }
-    input, button, textarea, select, optgroup, option
-    {
-        font-family: inherit;
-        font-size: inherit;
-        font-style: inherit;
-        font-weight: inherit;
-    }
-    input, button, textarea, select
-    {
-        font-size: 100%;
-    }
-    body
-    {
-        font: normal 13px/1.2 Verdana;
-        color: #363534;
-    }
-    strong
-    {
-        font-weight: bold;
-    }
-    em
-    {
-        font-style: italic;
-    }
-    a
-    {
-        color: #00732f;
-        text-decoration: none;
-    }
-    .header, .footer, .wrapper
-    {
-        /*min-width: 600px;*/
-        max-width: 1500px;
-        margin: 0 5px;
-    }
-    .wrapper
-    {
-	position:relative;
-	top:50px;
-    }
-    .wrapper .bd
-    {
-        position: relative;
-    }
-
-    .header, .footer
-    {
-        display: block;
-        clear: both;
-        overflow: hidden;
-    }
-    .header
-    {
-        height: 115px;
-        position: relative;
-    }
-    
-    
-    .header .qtref
-    {
-        position: absolute;
-        top: 28px;
-        left: 88px;
-        width: 302px;
-        height: 22px;
-    }
-    .header .qtref span
-    {
-        display: block;
-        height: 22px;
-    }
-    .wrap .content h1
-    {
-        font: 600 18px/1.2 Arial;
-    }
-    .wrap .content h2
-    {
-        font: 600 16px/1.2 Arial;
-    }
-    .wrap .content h3
-    {
-        font: 600 14px/1.2 Arial;
-    }
-    .wrap .content h4
-    {
-        font: 600 12px/1.2 Arial;
-    }
-	
-    .wrap .content p
-    {
-        line-height: 20px;
-        padding: 5px;
-    }
-    .wrap .content table p
-    {
-        line-height: 20px;
-        padding: 0px;
-    }	
-    .wrap .content ul
-    {
-        padding-left: 25px;
-        padding-top: 10px;
-    }
-    a:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }
-    .content a:visited
-    {
-        color: #4c0033;
-        text-decoration: none;
-    }
-     .content a:visited:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }   
-
-    pre
-    {
-        border: 1px solid #DDDDDD;
-        margin: 0 20px 10px 10px;
-        padding: 20px 15px 20px 20px;
-        overflow-x: auto;
-    }
-    table, pre
-    {
-        -moz-border-radius: 7px 7px 7px 7px;
-        background-color: #F6F6F6;
-        border: 1px solid #E6E6E6;
-        border-collapse: separate;
-        font-size: 11px;
-        /*min-width: 395px;*/
-        margin-bottom: 25px;
-        display: inline-block;
-    }
-    thead
-    {
-        margin-top: 5px;
-		font:600 12px/1.2 Arial;
-    }
-    th
-    {
-        padding: 5px 15px 5px 15px;
-        background-color: #E1E1E1;
-      /*  border-bottom: 1px solid #E6E6E6;*/
-        border-left: 1px solid #E6E6E6;
-      /*  border-right: 1px solid #E6E6E6;*/
-    }
-    td
-    {
-        padding: 3px 15px 3px 20px;
-  /*      border-left: 1px solid #E6E6E6;
-        border-right: 1px solid #E6E6E6;*/
-    }
-    tr.odd td:hover,  tr.even td:hover
-    {
-    /*    border-right: 1px solid #C3C3C3;
-        border-left: 1px solid #C3C3C3;*/
-    }
-		
-	td.rightAlign
-	{
-        padding: 3px 15px 3px 10px;
-	}
-    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;
-    }
-    table tr.odd td:hover, table tr.even td:hover
-    {
-        background-color: #E6E6E6;
-    }
-    		
-    span.comment
-    {
-        color: #8B0000;
-        font-style: italic;
-    }
-    span.string, span.char
-    {
-        color: #254117;
-    }
-
-    .qmltype
-    {
-        text-align: center;
-        font-size: 160%;
-    }
-    .qmlreadonly
-    {
-        float: right;
-        color: #254117;
-    }
-
-    .qmldefault
-    {
-        float: right;
-        color: red;
-    }
-
-	.footer
-    {
-		border-top:1px solid #E5E5E5;
-        min-height: 100px;
-        color: #797775;
-        font: normal 9px/1 Verdana;
-        text-align: center;
-        padding-top: 40px;
-        margin: 0;
-    }
-
-    
-     .wrap
-    {
-        margin: 0 5px 0 5px;
-    }
-    .wrap .toolbar
-    {
-     display:block;
-    }
-
-    .wrap .breadcrumb ul li
-    {
-        float: left;
-        background: url(../images/breadcrumb.png) no-repeat 0 5px;
-        padding-left: 15px;
-        margin-left: 15px;
-        font-weight: bold;
-    }
-    .wrap .breadcrumb ul li.last
-    {
-        font-weight: normal;
-    }
-    .wrap .breadcrumb ul li a
-    {
-      /*  color: #363534;*/
-        color: #00732F;
-    }
-    .wrap .breadcrumb ul li.first
-    {
-        background-image: none;
-        padding-left: 0;
-        margin-left: 0;
-    }
-    .wrap .content
-    {
-		word-wrap:break-word;
-    }
-    .wrap .content li
-    {
-        padding-left: 12px;
-        background: url(../images/bullet_sq.png) no-repeat 0 5px; 
-        font: inherit; 
-       /* color: #44a51c;*/ 
-        margin-bottom: 10px;
-    } 
-
-    .wrap .content ol li { 
-        background:none; 
-        font: inherit; 
-        margin-bottom:10px; 
-        padding-left: 0px;
-    } 
-
-    .wrap .content ol li { 
-    	list-style-type:decimal; 
-    }
-
-    .wrap .content .descr ol li {
-	margin-left: 45px;
-
-    }
-
-    .offline .wrap .content
-    {
-        padding-top: 15px;
-    }
-
-    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
-    {
-        content: ".";
-        display: block;
-        height: 0;
-        clear: both;
-        visibility: hidden;
-    }
-    
-    hr
-    {
-        background-color: #E6E6E6;
-        border: 1px solid #E6E6E6;
-        height: 1px;
-        width: 100%;
-        text-align: left;
-        margin: 5px 0px 5px 0px;
-    }
-
-    .content .alignedsummary
-    {
-        margin: 5px;
-		width:100%;
-    }
-
-     
-    .toc
-    {
-        float: right;
-        -moz-border-radius: 7px 7px 7px 7px;
-        background-color: #F6F6F6;
-        border: 1px solid #DDDDDD;
-        margin: 0 20px 10px 10px;
-        padding: 20px 15px 20px 20px;
-        height: auto;
-        width: 200px;
-    }
-
-    .toc h3, .generic a
-    {
-        font: 600 12px/1.2 Arial;
-    }
-
-    .wrap .content .toc ul
-    {
-        padding-left: 0px;
-    }
-
-
-    .wrap .content .toc .level2
-    {
-        margin-left: 15px;
-    }
-
-    .wrap .content .toc .level3
-    {
-        margin-left: 30px;
-    }
-
-    .content .toc li
-    {
-        font: normal 10px/1.2 Verdana;
-        background: url(../images/bullet_dn.png) no-repeat 0 5px;
-    }
-	
-	
-	.generic{
-		max-width:75%;
-	}
-	.generic td{
-		padding:0;
-	}
-	
-	.generic .odd .alphaChar{
-        background-color: #F6F6F6;
-	}
-	
-	.generic .even .alphaChar{
-        background-color: #FFFFFF;
-	}
-
-	.highlightedCode
-	{
-	margin:10px;
-	}
-
-	.flowList{
-	vertical-align:top;
-	}	
-	.alphaChar{
-	width:100%;
-	background-color:#F6F6F6;
-	border:1px solid #E6E6E6;
-	font-size:12pt;
-	padding-left:10px;
-	margin-top:10px;
-	margin-bottom:10px;
-	}
-
-	.flowList dl{
-	}
-	.flowList dd{
-	display:inline-block;
-	margin-left:10px;
-	width:250px;
-	}
-	.wrap .content .flowList p{
-	padding:0px;
-	}
-	
-    .relpage
-    {
-        -moz-border-radius: 7px 7px 7px 7px;
-        border: 1px solid #DDDDDD;
-        padding: 25px 25px;
-        clear: both;
-    }
-    .relpage ul
-    {
-        float: none;
-        padding: 15px;
-    }
-    .content .relpage li
-    {
-        font: normal 11px/1.2 Verdana;
-    }
-    h3.fn, span.fn
-    {
-        background-color: #F6F6F6;
-        border-width: 1px;
-        border-style: solid;
-        border-color: #E6E6E6;
-        font-weight: bold;
-		word-spacing:3px;
-    }
-
-	.functionIndex {
-	font-size:12pt;
-	word-spacing:10px;
-	margin-bottom:10px;
-    background-color: #F6F6F6;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #E6E6E6;
-	width:100%;
-	}
-	
-	.centerAlign {	text-align:center;}
-	.rightAlign {text-align:right;}
-	.leftAlign {text-align:left;}
-	.topAlign{vertical-align:top	}
-	.functionIndex a{display:inline-block;}
-
-    /* start index box */
-    .indexbox
-    {
-        width: 100%;
-		display:inline-block;
-    }
-
-    .indexboxcont { display: block; }
-
-    .indexboxbar
-    {
-		border-bottom:1px solid #E5E5E5;
-        margin-bottom: 25px;
-    }
-
-    .indexboxcont .section
-    {
-        display: inline-block;
-        padding:0 2% 0 1%;
-        vertical-align:top;
-	}
-
-	.indexboxcont .section {
-	  float: left;
-	}
-
-    .indexboxcont .section p
-    {
-        padding-top: 20px;
-        padding-bottom: 20px;
-    }
-    .indexboxcont .sectionlist
-    {
-        display: inline-block;
-		vertical-align:top;
-        padding: 0;
-    }
-    .indexboxcont .sectionlist ul
-    {
-        margin-bottom: 20px;
-    }
-
-    .indexboxcont .sectionlist ul li
-    {
-        line-height: 12px;
-    }
-
-    .content .indexboxcont li
-    {
-        font: normal 600 13px/1 Verdana;
-    }
-
-    .indexbox a:hover, .indexbox a:visited:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }
-
-    .indexbox a:visited
-    {
-        color: #00732f;
-        text-decoration: none;
-    }
-	
-	.indexbox .indexIcon {
-	width: 11%;
-	}
-	
-   
-    .indexboxcont:after
-    {
-        content: ".";
-        display: block;
-        height: 0;
-        clear: both;
-        visibility: hidden;
-    }
-	
-    body.offline
-    {
-      background-image: none;
-    }
-
-    .offline .footer {
-      margin: 0;
-    }
-    .offline .header
-    {
-      width: 100%;
-      margin: 0;
-      height: auto;
-      background-color: #ffffff;
-      padding: 10px 0 5px 0;
-      overflow: visible;
-	  border-bottom: solid #E5E5E5 1px;
-	  z-index:1;
-	  position:fixed;
-    }
-
-    .offline .header .content
-    {
-    }
-    .offline .header .qtref
-    {
-      color: #00732F;
-      position: static;
-      float: left;
-      margin-left: 5px;
-      font: bold 18px/1 Arial;
-    }
-
-    .offline .header .qtref:visited
-    {
-      color: #00732F;
-	  }
-    .offline .header .qtref:hover
-    {
-      color: #00732F;
-	  text-decoration:none;
-	  }
-    .offline .header .qtref span
-    {
-      background-image: none;
-      text-indent: 0;
-	  text-decoration:none;
-    }
-
-    .offline .wrap
-    {
-        margin: 0 5px 0 5px;
-    }
-
-    .offline .wrap .toolbar
-    {
-      display:block;
-	  padding-top:5px;
-    }
-
-    .offline .wrap .breadcrumb ul li {
-      font-weight: normal;
-    }
-
-    .offline .wrap .breadcrumb ul li a {
-      /*color: #44a51c;*/
-    }
-
-    .offline .wrap .breadcrumb ul li.last a {
-      /*color: #363534;*/
-    }
-    
-
-    
-    .narrow .indexboxcont .section {
-      width: 64%;
-      padding-left: 0;
-    }
-    
-    .narrow .indexboxcont .sectionlist {
-      width: 32.5%;
-    }
-
-    .header .icon,
-	.sidebar,
-	.feedback,
-	.t_button,
-    .feedback,
-	#feedbackBox,
-	#feedback,
-	#blurpage,
-	.indexbox .indexIcon span,
-	.wrapper .hd,
-	.offline .indexbox .indexIcon,
-	.offline .header #nav-logo,
-	#offlinemenu,
-	#offlinesearch,
-	.offline .header #nav-topright,
-    .offline .header #shortCut ,
-	.offline .wrapper .hd,
-    .offline .wrapper .ft,
-	.offline .sidebar,
-	.offline .wrap .feedback
-    {
-	display:none;
-    }
-
-    /* end offline mode */
-#narrowmenu {
-      display: none;
-      float: right;
-      margin: 15px 40px 0 0;
-      font-size: 11px;
-    }
-
-    .narrow #narrowmenu {
-      display: block;
-    }
-	
-	#narrowsearch{
-		display:none;
-	}
-
-	#narrowmenu ul
-	{
-	  border-bottom:solid 1px #E5E5E5;
-	  border-left:solid 1px #E5E5E5;
-	  border-right:solid 1px #E5E5E5;
-	}
-
-    #narrowmenu a {
-      line-height: 1.1;
-      background: url(../images/arrow_down.png) no-repeat 100% 50%;
-      white-space: nowrap;
-      padding: 0 16px 0 5px;
-    }
-
-    #narrowmenu li {
-      margin-left: 20px;
-    }
-
-    #narrowmenu li li {
-      margin: 0 0 5px 0;
-    }
-
-    #narrowmenu li li a {
-      padding: 0;
-      background-image: none;
-    }
-
-    #narrowmenu li,
-    #narrowmenu li ul {
-      background-color: #fff;
-    }
-
-    #narrowmenu li ul {
-      width: auto;
-      padding: 5px;
-      margin-top:-15px;
-   }
-
-    .sf-menu li:hover ul, .sf-menu li.sfHover ul {
-      top: 1.2em;
-    }
-.sf-menu, .sf-menu * {
-	margin:			0;
-	padding:		0;
-	list-style:		none;
-}
-.sf-menu {
-	line-height:	1.0;
-}
-.sf-menu ul {
-	position:		absolute;
-	top:			-999em;
-	width:			10em; /* left offset of submenus need to match (see below) */
-}
-.sf-menu ul li {
-	width:			100%;
-}
-.sf-menu li:hover {
-	visibility:		inherit; /* fixes IE7 'sticky bug' */
-}
-.sf-menu li {
-	float:			left;
-	position:		relative;
-}
-.sf-menu a {
-	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;
-}
-ul.sf-menu li:hover li ul,
-ul.sf-menu li.sfHover li ul {
-	top:			-999em;
-}
-ul.sf-menu li li:hover ul,
-ul.sf-menu li li.sfHover ul {
-	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;
-}
-ul.sf-menu li li li:hover ul,
-ul.sf-menu li li li.sfHover ul {
-	left:			10em; /* match ul width */
-	top:			0;
-}
-
-}
-/* end of screen media */
-
-/* start of print media */
-
-@media print
-{
-     input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft
-    {
-        display: none;
-        background: none;
-    }
-    .content
-    {
-        position: absolute;
-        top: 0px;
-        left: 0px;
-        background: none;
-        display: block;
-    }
-}
-/* end of print media */
diff --git a/doc/templates/style/narrow.css b/doc/templates/style/narrow.css
index 05159aa56..de5b0a09f 100644
--- a/doc/templates/style/narrow.css
+++ b/doc/templates/style/narrow.css
@@ -15,7 +15,12 @@
     }
 
     .narrow .footer {
-      margin: 0;
+      margin: 0px;
+    }
+
+    .creator .header, .creator .header .content, .creator .footer, .creator .wrapper {
+      margin: 0px;
+      min-width: 300px;
     }
     .narrow .header
     {
@@ -49,7 +54,7 @@
 
     .narrow .header .qtref a
     {
-      color: #363534;
+      color: #00732F;
     }
 
     .narrow .header .qtref span
@@ -98,7 +103,7 @@
     }
     .narrow .header #shortCut ul li a
     {
-      color: #44a51c;
+      color: #00732F;
     }
 
     .narrow .wrapper .hd
@@ -126,6 +131,11 @@
         margin: 0 5px 0 5px;
     }
 
+    .creator .wrap
+    {
+        margin: 0px;
+		background:#FFFFFF;
+    }
     .narrow .wrap .toolbar
     {
       border-bottom: none;
@@ -135,7 +145,14 @@
     {
         padding-top: 15px;
     }
-
+    .creator .wrap .content
+    {
+        padding-top: 10px;
+    }
+    .creator .wrap .content .guide
+    {
+        padding-top: 15px;
+    }
     .narrow .wrap .feedback
     {
         display: none;
@@ -186,6 +203,9 @@
       *border: 1px solid #fff;
       *height: 17px;
       _height: 18px;
+	  /* to be fixed */
+	  display: none;
+	  /* to be fixed */
     }
 
     .narrow .indexbox .indexIcon {
diff --git a/doc/templates/style/offline.css b/doc/templates/style/offline.css
new file mode 100644
index 000000000..dac205d44
--- /dev/null
+++ b/doc/templates/style/offline.css
@@ -0,0 +1,627 @@
+body{
+font: normal 400 14px/1.2 Arial;
+margin-top:85px;
+font-family: Arial, Helvetica;
+color:#313131;
+text-align:justify;
+margin-left:5px;
+margin-right:5px;
+}
+
+img{
+-moz-box-shadow: 3px 3px 3px #ccc;
+-webkit-box-shadow: 3px 3px 3px #ccc;
+box-shadow: 3px 3px 3px #ccc;
+border:#8E8D8D 2px solid;
+margin-left:0px;
+max-width: 800px;
+height: auto
+}
+
+b{
+font-weight:600;
+}
+
+.content{}
+
+.descr{
+margin-top:35px;
+/*max-width: 75%;*/
+margin-left:5px;
+text-align:justify;
+min-height:700px;
+vertical-align:top;
+}
+
+.name{
+max-width: 75%;
+font-weight:100;
+}
+
+tt{
+text-align:left;}
+
+/*
+-----------
+links
+-----------
+*/
+
+a:link{
+color: #2C418D;
+text-decoration: none;
+text-align:left;
+}
+
+a:hover{
+color: #869CD1;
+text-decoration:underline;
+text-align:left;
+}
+
+a:visited{
+color: #869CD1;
+text-decoration: none;
+text-align:left;
+}
+
+a:visited:hover{
+text-decoration:underline;
+text-align:left;
+}
+
+a[href*="http://"], a[href*="ftp://"],a[href*="https://"]
+{
+text-decoration: none;
+background-image:url(../images/ico_out.png);
+background-repeat:no-repeat;
+background-position:left;
+padding-left:20px;
+text-align:left;
+}
+
+/*a[href*="http://qt.nokia.com/doc/"], a[href*="http://doc.qt.nokia.com/"]
+{
+background: none;
+padding-left: 0px;
+text-align:left;
+}*/
+
+.flags{
+text-decoration:none;
+text-height:24px;
+}
+
+/*
+-------------------------------
+NOTE styles
+-------------------------------
+*/
+.notetitle, .tiptitle, .fastpathtitle{
+font-weight:bold;
+}
+
+.attentiontitle,.cautiontitle,.dangertitle,.importanttitle,.remembertitle,.restrictiontitle{
+font-weight:bold;
+}
+
+.note,.tip,.fastpath{
+background: #F2F2F2 url(../images/ico_note.png);
+background-repeat: no-repeat;
+background-position: top left;
+padding:5px;
+padding-left:40px;
+padding-bottom:10px;
+border:#999 1px dotted;
+color:#666666;
+margin:5px;
+}
+
+.attention,.caution,.danger,.important,.remember,.restriction{
+background: #F2F2F2 url(../images/ico_note_attention.png);
+background-repeat:no-repeat;
+background-position:top left;
+padding:5px;
+padding-left:40px;
+padding-bottom:10px;
+border:#999 1px dotted;
+color:#666666;
+margin:5px;
+}
+
+/*
+-------------------------------
+Top navigation
+-------------------------------
+*/
+
+.header{
+
+height:1px;
+padding:0px;
+margin:0px;
+}
+
+.qtref{
+display: block;
+position: relative;
+top: -76px;
+height:15px;
+z-index: 1;
+font-size:11px;
+padding-right:10px;
+float:right;
+}
+
+.naviNextPrevious{
+display: block;
+position: relative;
+text-align: right;
+top: -53px;
+float:right;
+height:20px;
+z-index:1;
+padding-right:10px;
+padding-top:2px;
+vertical-align:top;
+margin:0px;
+}
+
+
+.naviNextPrevious > a:first-child{
+background-image:url(../images/btn_prev.png);
+background-repeat:no-repeat;
+background-position:left;
+padding-left:20px;
+height:20px;
+padding-left:20px;
+}
+
+.naviNextPrevious > a:last-child{
+background-image:url(../images/btn_next.png);
+background-repeat:no-repeat;
+background-position:right;
+padding-right:20px;
+height:20px;
+margin-left:30px;
+}
+
+.breadcrumb{
+display: block;
+position: relative;
+top:-20px;
+border-top:2px solid #ffffff;
+border-bottom: 1px solid #cecece;
+background-color:#F2F2F2;
+z-index:1;
+height:20px;
+padding:0px;
+margin:0px;
+padding-left:10px;
+padding-top:2px;
+}
+
+.breadcrumb ul{
+ margin:0px;
+ padding:0px;
+}
+
+.breadcrumb ul li{
+background-color:#F2F2F2;
+list-style-type:none;
+padding:0;
+margin:0;
+height:20px;
+}
+
+.breadcrumb li{
+float:left;
+}
+
+.breadcrumb .first {
+background:url(../images/home.png);
+background-position:left;
+background-repeat:no-repeat;
+padding-left:20px;
+}
+
+
+.breadcrumb li a{
+color:#2C418D;
+display:block;
+text-decoration:none;
+background:url(../images/arrow.png);
+background-repeat:no-repeat;
+background-position:right;
+padding-right:25px;
+padding-left:10px;
+}
+
+.breadcrumb li a:hover{
+color:#909090;
+display:block;
+text-decoration:none;
+background:url(../images/arrow.png);
+background-repeat:no-repeat;
+background-position:right;
+padding-right:20px;
+padding-left:10px;
+}
+
+
+/* table of content
+no display
+*/
+
+/*
+-----------
+headers
+-----------
+*/
+
+
+@media screen{
+.title{
+color:#313131;
+font-size: 18px;
+font-weight: normal;
+left: 0;
+padding-bottom: 20px;
+padding-left: 10px;
+padding-top: 20px;
+position: absolute;
+right: 0;
+top: 0;
+background-color:#E6E6E6;
+border-bottom: 1px #CCC solid;
+border-top: 2px #CCC solid;
+font-weight:bold;
+margin-left:5px;
+margin-right:5px;
+}
+}
+
+h1 {
+margin: 0;
+}
+
+h2, p.h2 {
+font: 500 16px/1.2 Arial;
+font-weight:100;
+background-color:#F2F3F4;
+padding:4px;
+margin-bottom:30px;
+margin-top:30px;
+border-top:#E0E0DE 1px solid;
+border-bottom: #E0E0DE 1px solid;
+max-width: 99%;
+}
+
+h3{
+
+font: 500 14px/1.2 Arial;
+font-weight:100;
+text-decoration:underline;
+margin-bottom:30px;
+margin-top:30px;
+}
+
+h3.fn,span.fn{
+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;
+background-color: #F6F6F6;
+word-spacing: 3px;
+padding: 5px 5px;
+text-decoration:none;
+font-weight:bold;
+max-width:75%;
+font-size:14px;
+margin:0px;
+margin-top:30px;
+
+}
+
+.name{
+color:#1A1A1A;
+}
+.type{
+color:#808080;
+}
+
+
+
+@media print {
+.title {
+color:#0066CB;
+font-family:Arial, Helvetica;
+font-size: 32px;
+font-weight: normal;
+left: 0;
+position: absolute;
+right: 0;
+top: 0;
+}
+}
+
+
+/*
+-----------------
+table styles
+-----------------
+*/
+.table img {
+border:none;
+margin-left:0px;
+-moz-box-shadow:0px 0px 0px #fff;
+-webkit-box-shadow: 0px 0px 0px #fff;
+box-shadow: 0px 0px 0px #fff;
+}
+
+/* table with border alternative colours*/
+
+ table,pre{
+-moz-border-radius: 7px 7px 7px 7px;
+-webkit-border-radius: 7px 7px 7px 7px;
+ border-radius: 7px 7px 7px 7px;
+background-color: #F6F6F6;
+border: 1px solid #E6E6E6;
+border-collapse: separate;
+font-size: 12px;
+line-height: 1.2;
+margin-bottom: 25px;
+margin-left: 15px;
+font-size: 12px;
+line-height: 1.2;
+margin-bottom: 25px;
+margin-left: 15px;
+}
+
+
+table th{
+text-align:left;
+padding-left:20px;
+}
+
+table td {
+padding: 3px 15px 3px 20px;
+border-bottom:#CCC dotted 1px;
+}
+table p { margin:0px;}
+
+table tr.even {
+background-color: white;
+color: #66666E;
+}
+
+table tr.odd {
+background-color: #F6F6F6;
+color: #66666E;
+}
+
+
+table thead {
+text-align:left;
+padding-left:20px;
+background-color:#e1e0e0;
+border-left:none;
+border-right:none;
+}
+
+table thead th {
+padding-top:5px;
+padding-left:10px;
+padding-bottom:5px;
+border-bottom: 2px solid #D1D1D1;
+padding-right:10px;
+}
+
+
+/* table bodless & white*/
+
+.borderless {
+border-radius: 0px 0px 0px 0px;
+background-color: #fff;
+border: 1px solid #fff;
+}
+
+.borderless tr {
+background-color: #FFF;
+color: #66666E;
+}
+
+.borderless td {
+border:none;
+border-bottom:#fff dotted 1px;
+}
+
+/*
+-----------
+List
+-----------
+*/
+
+ul{
+padding-bottom:2px;
+}
+
+li {
+margin-bottom: 10px;
+padding-left: 8px;
+list-style:outside;
+list-style-type:square;
+text-align:left;
+}
+
+
+ol{
+margin:10px;
+padding:0;
+}
+
+ol > li{
+margin-left: 30px;
+padding-left:8px;
+list-style:decimal;
+}
+
+.centerAlign{
+text-align: left;
+}
+
+.cpp{
+display: block;
+margin: 10;
+overflow: hidden;
+overflow-x: hidden;
+overflow-y: hidden;
+padding: 20px 0 20px 0;
+}
+
+.footer{
+margin-top: 50px;
+padding-left:5px;
+margin-bottom: 10px;
+font-size:10px;
+border-top: 1px solid #999;
+padding-top:11px;
+}
+
+.footerNavi{
+width:auto;
+text-align:right;
+margin-top:50px;
+z-index:1;
+}
+
+.memItemLeft{
+padding-right: 3px;
+}
+
+.memItemRight{
+padding: 3px 15px 3px 0;
+}
+
+.qml{
+display: block;
+margin: 10;
+overflow: hidden;
+overflow-x: hidden;
+overflow-y: hidden;
+padding: 20px 0 20px 0;
+}
+
+.qmldefault{
+padding-left: 5px;
+float: right;
+color: red;
+}
+
+.qmlreadonly{
+padding-left: 5px;
+float: right;
+color: #254117;
+}
+
+.rightAlign{
+padding: 3px 5px 3px 10px;
+text-align: right;
+}
+
+/*
+-----------
+Content table
+-----------
+*/
+
+@media print{
+.toc {
+float: right;
+padding-bottom: 10px;
+padding-top: 50px;
+width: 100%;
+background-image:url(../images/bgrContent.png);
+background-position:top;
+background-repeat:no-repeat;
+}
+}
+
+@media screen{
+.toc{
+clear:both;
+float:right;
+vertical-align:top;
+-moz-border-radius: 7px 7px 7px 7px;
+-webkit-border-radius: 7px 7px 7px 7px;
+border-radius: 7px 7px 7px 7px;
+ background:#FFF url(../images/bgrContent.png);
+background-position:top;
+background-repeat:repeat-x;
+border: 1px solid #E6E6E6;
+padding-left:5px;
+padding-bottom:10px;
+height: auto;
+width: 200px;
+text-align:left;
+z-index:2;
+margin-left:20px;
+margin-right:20px;
+margin-top:0px;
+padding-top:0px;
+}
+}
+
+.toc h3{
+text-decoration:none;
+}
+
+.toc h3{font: 500 14px/1.2 Arial;
+font-weight:100;
+padding:0px;
+margin:0px;
+padding-top:5px;
+padding-left:5px;
+}
+
+
+.toc ul{
+width:160px;
+padding-left:10px;
+padding-right:5px;
+padding-bottom:10px;
+padding-top:10px;
+}
+
+.toc ul li{
+margin-left:20px;
+list-style-image:url(../images/blu_dot.png);
+list-style:outside;
+
+}
+
+
+.toc ul li a:link{
+color: #2C418D;
+text-decoration: none;
+}
+
+.toc ul li a:hover{
+color: #869CD1;
+text-decoration:underline;
+
+}
+
+.toc ul li a:visited{
+color: #869CD1;
+font-weight: bold;
+}
+
+.level1{
+border:none;}
+
+.clearfix{
+clear:both;}
+
diff --git a/doc/templates/style/style.css b/doc/templates/style/style.css
index 90cfa2c21..af16d41e7 100644
--- a/doc/templates/style/style.css
+++ b/doc/templates/style/style.css
@@ -1,5 +1,7 @@
 @media screen
 {
+ 
+/* basic elements */
     html
     {
         color: #000000;
@@ -18,6 +20,7 @@
     fieldset, img
     {
         border: 0;
+        max-width:100%;
     }
     address, caption, cite, code, dfn, em, strong, th, var, optgroup
     {
@@ -32,6 +35,10 @@
     {
         list-style: none;
     }
+    ol li
+    {
+        list-style: decimal;
+    }    
     caption, th
     {
         text-align: left;
@@ -39,7 +46,6 @@
     h1, h2, h3, h4, h5, h6
     {
         font-size: 100%;
-/*        font-weight: normal; */
     }
     q:before, q:after
     {
@@ -50,30 +56,13 @@
         border: 0;
         font-variant: normal;
     }
-    sup
-    {
-        vertical-align: baseline;
-    }
-    sub
+    sup, sub
     {
         vertical-align: baseline;
     }
-	tt, .qmlreadonly span, .qmldefault span
-	{
-		word-spacing:5px;
-	}
-    .heading
-    {
-        font: normal 600 16px/1.0 Arial;
-        padding-bottom: 15px;
-    }
-    .subtitle
+    tt, .qmlreadonly span, .qmldefault span
     {
-        font-size: 13px;
-    }
-    .small-subtitle
-    {
-        font-size: 13px;
+        word-spacing:5px;
     }
     legend
     {
@@ -90,9 +79,19 @@
     {
         font-size: 100%;
     }
+    strong
+    {
+        font-weight: bold;
+    }
+    em
+    {
+        font-style: italic;
+    }
+
+    /* adding Qt theme */    
     html
     {
-        background-color: #e5e5e5;
+      /*  background-color: #e5e5e5;*/
     }
     body
     {
@@ -100,73 +99,119 @@
         font: normal 13px/1.2 Verdana;
         color: #363534;
     }
-    strong
+    a
     {
-        font-weight: bold;
+        color: #00732f;
+        text-decoration: none;
     }
-    em
+    hr
     {
-        font-style: italic;
+        background-color: #E6E6E6;
+        border: 1px solid #E6E6E6;
+        height: 1px;
+        width: 100%;
+        text-align: left;
+        margin: 15px 0px 15px 0px;
     }
-    a
+
+    pre
     {
-        color: #00732f;
-        text-decoration: none;
+        border: 1px solid #DDDDDD;
+        -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;
     }
-    .header, .footer, .wrapper
+    table, pre
     {
-        min-width: 600px;
-        max-width: 1500px;
-        margin: 0 30px;
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border: 1px solid #E6E6E6;
+        border-collapse: separate;
+        font-size: 11px;
+        margin-bottom: 25px;
     }
-    .wrapper
+    pre.highlightedCode {
+        display: block;
+        overflow:hidden;
+    }    
+    thead
     {
-        background: url(../images/bg_r.png) repeat-y 100% 0;
+        margin-top: 5px;
+        font:600 12px/1.2 Arial;
     }
-    .wrapper .hd
+    th
     {
-        padding-left: 216px;
-        height: 15px;
-        background: url(../images/page.png) no-repeat 0 0;
-        overflow: hidden;
+        padding: 5px 15px 5px 15px;
+        background-color: #E1E1E1;
+        border-left: 1px solid #E6E6E6;
     }
-    .offline .wrapper .hd
+    td
     {
-        background: url(../images/page.png) no-repeat 0 -15px;
+        padding: 3px 15px 3px 15px;
     }
-    .wrapper .hd span
+    tr.odd td:hover,  tr.even td:hover    {}
+        
+    td.rightAlign
     {
-        height: 15px;
-        display: block;
-        overflow: hidden;
-        background: url(../images/page.png) no-repeat 100% -30px;
+        padding: 3px 5px 3px 10px;
     }
-    .wrapper .bd
+    table tr.odd
     {
-        background: url(../images/bg_l.png) repeat-y 0 0;
-        position: relative;
+        border-left: 1px solid #E6E6E6;
+        background-color: #F6F6F6;
+        color: #66666E;
     }
-    .offline .wrapper .bd
+    table tr.even
     {
-        background: url(../images/bg_l_blank.png) repeat-y 0 0;
+        border-left: 1px solid #E6E6E6;
+        background-color: #ffffff;
+        color: #66666E;
     }
-    .wrapper .ft
+    table tr.odd td:hover, table tr.even td:hover
     {
-        padding-left: 216px;
-        height: 15px;
-        background: url(../images/page.png) no-repeat 0 -75px;
-        overflow: hidden;
+     /*   background-color: #E6E6E6;*/ /* disabled until further notice */
     }
-    .offline .wrapper .ft
+            
+    span.comment
     {
-        background: url(../images/page.png) no-repeat 0 -90px;
+        color: #8B0000;
+        font-style: italic;
     }
-    .wrapper .ft span
+    span.string, span.char
     {
-        height: 15px;
-        display: block;
-        background: url(../images/page.png) no-repeat 100% -60px;
-        overflow: hidden;
+        color: #254117;
+    }
+
+
+/* end basic elements */
+
+/* font style elements */
+    .heading
+    {
+        font: normal bold 16px/1.2 Arial;
+        padding-bottom: 15px;
+    }
+    .subtitle
+    {
+        font-size: 13px;
+    }
+    .small-subtitle
+    {
+        font-size: 13px;
+    }
+/* end font style elements */
+
+/* global settings*/
+    .header, .footer, .wrapper
+    {
+        min-width: 600px;
+        max-width: 1500px;
+        margin: 0 30px;
     }
     .header, .footer
     {
@@ -174,6 +219,17 @@
         clear: both;
         overflow: hidden;
     }
+    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
+    {
+        content: ".";
+        display: block;
+        height: 0;
+        clear: both;
+        visibility: hidden;
+    }
+    
+/* end global settings*/
+/* header elements */
     .header
     {
         height: 115px;
@@ -201,7 +257,247 @@
         text-indent: -999em;
         background: url(../images/sprites-combined.png) no-repeat -78px -235px;
     }
+    .content a:visited
+    {
+        color: #4c0033;
+        text-decoration: none;
+    }
+     .content a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+    
+    #nav-topright
+    {
+        height: 70px;
+    }
+
+    #nav-topright ul
+    {
+        list-style-type: none;
+        float: right;
+        width: 370px;
+        margin-top: 11px;
+    }
+
+    #nav-topright li
+    {
+        display: inline-block;
+        margin-right: 20px;
+        float: left;
+    }
+
+    #nav-topright li.nav-topright-last
+    {
+        margin-right: 0;
+    }
+
+    #nav-topright li a
+    {
+        background: transparent url(../images/sprites-combined.png) no-repeat;
+        height: 18px;
+        display: block;
+        overflow: hidden;
+        text-indent: -9999px;
+    }
+
+    #nav-topright li.nav-topright-home a
+    {
+        width: 65px;
+        background-position: -2px -91px;
+    }
+
+    #nav-topright li.nav-topright-home a:hover
+    {
+        background-position: -2px -117px;
+    }
+
+
+    #nav-topright li.nav-topright-dev a
+    {
+        width: 30px;
+        background-position: -76px -91px;
+    }
+
+    #nav-topright li.nav-topright-dev a:hover
+    {
+        background-position: -76px -117px;
+    }
 
+
+    #nav-topright li.nav-topright-labs a
+    {
+        width: 40px;
+        background-position: -114px -91px;
+    }
+
+    #nav-topright li.nav-topright-labs a:hover
+    {
+        background-position: -114px -117px;
+    }
+
+    #nav-topright li.nav-topright-doc a
+    {
+        width: 32px;
+        background-position: -162px -91px;
+    }
+
+    #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a
+    {
+        background-position: -162px -117px;
+    }
+
+    #nav-topright li.nav-topright-blog a
+    {
+        width: 40px;
+        background-position: -203px -91px;
+    }
+
+    #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a
+    {
+        background-position: -203px -117px;
+    }
+
+    #nav-topright li.nav-topright-shop a
+    {
+        width: 40px;
+        background-position: -252px -91px;
+    }
+
+    #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a
+    {
+        background-position: -252px -117px;
+    }
+
+    #nav-logo
+    {
+        background: transparent url(../images/sprites-combined.png ) no-repeat 0 -225px;
+        left: -3px;
+        position: absolute;
+        width: 75px;
+        height: 75px;
+        top: 13px;
+    }
+    #nav-logo a
+    {
+        width: 75px;
+        height: 75px;
+        display: block;
+        text-indent: -9999px;
+        overflow: hidden;
+    }
+
+
+    .shortCut-topleft-inactive
+    {
+        padding-left: 3px;
+        padding-right: 3px;
+        background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px;
+        height: 20px;
+    }
+    .shortCut-topleft-inactive span
+    {
+        font-variant: normal;
+    }
+        .shortCut-topleft-inactive span a:hover,     .shortCut-topleft-active a:hover
+    {
+        text-decoration:none;
+    }
+    #shortCut
+    {
+        padding-top: 10px;
+        font-weight: bolder;
+        color: #b0adab;
+    }
+    #shortCut ul
+    {
+        list-style-type: none;
+        float: left;
+        width: 347px;
+        margin-left: 100px;
+    }
+    #shortCut li
+    {
+        display: inline-block;
+        margin-right: 25px;
+        float: left;
+        white-space: nowrap;
+    }
+    #shortCut li a
+    {
+        color: #b0adab;
+    }
+    #shortCut li a:hover
+    {
+        color: #44a51c;
+    }
+
+    
+    
+/* end header elements */    
+/* content and sidebar elements */
+    .wrapper
+    {
+        background: url(../images/bg_r.png) repeat-y 100% 0;
+    }
+    .wrapper .hd
+    {
+        padding-left: 216px;
+        height: 15px;
+        background: url(../images/page.png) no-repeat 0 0;
+        overflow: hidden;
+    }
+
+
+
+
+    .wrapper .hd span
+    {
+        height: 15px;
+        display: block;
+        overflow: hidden;
+        background: url(../images/page.png) no-repeat 100% -30px;
+    }
+    .wrapper .bd
+    {
+        background: url(../images/bg_l.png) repeat-y 0 0;
+        position: relative;
+    }
+
+
+
+
+    .wrapper .ft
+    {
+        padding-left: 216px;
+        height: 15px;
+        background: url(../images/page.png) no-repeat 0 -75px;
+        overflow: hidden;
+    }
+
+
+
+
+    .wrapper .ft span
+    {
+        height: 15px;
+        display: block;
+        background: url(../images/page.png) no-repeat 100% -60px;
+        overflow: hidden;
+    }
+    .navTop{ 
+    float:right;
+    display:block;
+    padding-right:15px;
+
+
+    }
+    
+
+    
+/* end content and sidebar elements */    
+/* sidebar elements */
     .sidebar
     {
         float: left;
@@ -210,10 +506,10 @@
         font-size: 11px;
     }
 
-    .offline .sidebar, .offline .feedback, .offline .t_button
-    {
-        display: none;
-    }
+
+
+
+
 
     .sidebar .searchlabel
     {
@@ -229,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
@@ -239,7 +535,7 @@
         width: 158px;
         height: 19px;
         padding: 0;
-        border: none;
+        border: 0px;
         outline: none;
         font: 13px/1.2 Verdana;
     }
@@ -256,9 +552,8 @@
 
     .sidebar .box h2
     {
-        font: normal 18px/1.2 Arial;
+        font: bold 16px/1.2 Arial;
         padding: 0;
-        min-height: 32px;
     }
     .sidebar .box h2 span
     {
@@ -271,10 +566,6 @@
     }
     .sidebar #lookup.box h2 span
     {
-        background: url(../images/sprites-combined.png) no-repeat -6px -311px;
-        width: 27px;
-        height: 35px;
-        margin-right: 13px;
     }
     .sidebar .box#topics h2
     {
@@ -282,10 +573,6 @@
     }
     .sidebar #topics.box h2 span
     {
-        background: url(../images/sprites-combined.png) no-repeat -94px -311px;
-        width: 27px;
-        height: 32px;
-        margin-right: 13px;
     }
     .sidebar .box#examples h2
     {
@@ -293,32 +580,25 @@
     }
     .sidebar #examples.box h2 span
     {
-        background: url(../images/sprites-combined.png) no-repeat -48px -311px;
-        width: 30px;
-        height: 31px;
-        margin-right: 9px;
     }
 
     .sidebar .box .list
     {
         display: block;
-		max-height:200px;
-		overflow-y:auto;
-		overflow-x:none;
-    }
-    .sidebar .box .live
-    {
-        display: none;
-        height: 100px;
-        overflow: auto;
+        max-height:200px;
+        min-height:120px;
+        overflow-y:auto;
+        overflow-x:none;
     }
-    .list li a:hover, .live li a:hover
+    .list li a:hover
     {
         text-decoration: underline;
     }
     .sidebar .box ul
     {
-	padding:10px;
+    padding-bottom:5px;
+    padding-left:10px;
+    padding-top:5px;
     }
     .sidebar .box ul li
     {
@@ -330,15 +610,52 @@
     {
         background: url(../images/box_bg.png) repeat-x 0 bottom;
     }
+     .sidebar .box ul li.noMatch
+    {
+        background: none;
+        color:#FF2A00;
+        font-style:italic;
+    }
+     .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;
+    }
+
+.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;
+}
+
+    .floatingResult:hover{
+        display:block;
+    }
+    .floatingResult:hover{
+    }
+    
+/* end sidebar elements */
+/* content elements */
     .wrap
     {
         margin: 0 5px 0 208px;
         overflow: visible; 
     }
-    .offline .wrap
-    {
-        margin: 0 5px 0 5px;
-    }
+
+
+
+
     .wrap .toolbar
     {
         background-color: #fafafa;
@@ -353,7 +670,7 @@
     .wrap .toolbar .breadcrumb
     {
         font-size: 11px;
-        line-height: 1;
+        line-height: 1.2;
         padding: 0 0 10px 21px;
         height: 10px;
     }
@@ -424,8 +741,11 @@
         color: #00732F;
     }
 
-    .offline .wrap .breadcrumb
+
+    .wrap .content
     {
+        padding: 30px;
+        word-wrap:break-word;
     }
 
     .wrap .breadcrumb ul
@@ -453,62 +773,54 @@
         padding-left: 0;
         margin-left: 0;
     }
-    .wrap .content
-    {
-        padding: 30px;
-        word-wrap: break-word;
-    }
 
-    .wrap .content li
-    {
-        padding-left: 12px;
-        background: url(../images/bullet_sq.png) no-repeat 0 5px;
-        font: normal 400 10pt/1 Verdana;
-       /* color: #44a51c;*/
-        margin-bottom: 10px; 
-    }
-    .content li:hover
-    {
-      /*  text-decoration: underline;*/
-    }
 
-    .wrap .content ol li {
-        background:none;
-        font: inherit;
-        margin-bottom:10px;
-        padding-left: 0px
-    }
 
-    .wrap .content ol li {
-        list-style-type:decimal;
-    }
 
-    .wrap .content .descr ol li {
-        margin-left: 45px;
-    }
+    .wrap .content ol li {
+    background:none;
+    font:normal 10pt/1.2 Verdana;
 
-    .wrap .content {
-        padding-top: 15px;
+    margin-bottom:10px;
+    margin-left:12px;
+    /*list-style-type:disc;*/
     }
-
-    .wrap .content ol img {
-        vertical-align: middle;
+    
+    .wrap .content ol li
+    {
+    background:none;
+    margin-bottom: 10px; 
+    padding-left:0px;
+    margin-left:52px;
     }
-    .wrap .content ul img {
-        vertical-align: middle;
+    
+    .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;
     }
 
+    .content li:hover  {}
+
     .wrap .content h1
     {
-        font: 600 18px/1.2 Arial;
+        font: bold 18px/1.2 Arial;
     }
     .wrap .content h2
     {
-        font: 600 16px/1.2 Arial;
+    border-bottom:1px solid #DDDDDD;
+    font:600 16px/1.2 Arial;
+    margin-top:15px;
+    width:100%;    
     }
     .wrap .content h3
     {
-        font: 600 14px/1.2 Arial;
+        font: bold 14px/1.2 Arial;
+        font:600 16px/1.2 Arial;
+        margin-top:15px;
+        width:100%;        
     }
     .wrap .content p
     {
@@ -518,37 +830,21 @@
     .wrap .content table p
     {
         line-height: 20px;
-        padding: 0px;
-    }	
+      /*  padding: 0px;*/
+    }    
     .wrap .content ul
     {
         padding-left: 25px;
         padding-top: 10px;
     }
+    .wrap .content ul img {
+        vertical-align:middle;
+    }    
     a:hover
     {
         color: #4c0033;
         text-decoration: underline;
     }
-    .content a:visited
-    {
-        color: #4c0033;
-        text-decoration: none;
-    }
-     .content a:visited:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }   .footer
-    {
-        min-height: 100px;
-        color: #797775;
-        font: normal 9px/1 Verdana;
-        text-align: center;
-        padding-top: 40px;
-        background-color: #E6E7E8;
-        margin: 0;
-    }
     .feedback
     {
         float: none;
@@ -565,265 +861,62 @@
         color: #00732F;
         text-decoration: underline;
     }
-    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
-    {
-        content: ".";
-        display: block;
-        height: 0;
-        clear: both;
-        visibility: hidden;
-    }
-    #nav-topright
-    {
-        height: 70px;
-    }
-
-    #nav-topright ul
-    {
-        list-style-type: none;
-        float: right;
-        width: 370px;
-        margin-top: 11px;
-    }
-
-    #nav-topright li
-    {
-        display: inline-block;
-        margin-right: 20px;
-        float: left;
-    }
-
-    #nav-topright li.nav-topright-last
-    {
-        margin-right: 0;
-    }
-
-    #nav-topright li a
-    {
-        background: transparent url(../images/sprites-combined.png) no-repeat;
-        height: 18px;
-        display: block;
-        overflow: hidden;
-        text-indent: -9999px;
-    }
-
-    #nav-topright li.nav-topright-home a
-    {
-        width: 65px;
-        background-position: -2px -91px;
-    }
-
-    #nav-topright li.nav-topright-home a:hover
-    {
-        background-position: -2px -117px;
-    }
-
-
-    #nav-topright li.nav-topright-dev a
-    {
-        width: 30px;
-        background-position: -76px -91px;
-    }
-
-    #nav-topright li.nav-topright-dev a:hover
-    {
-        background-position: -76px -117px;
-    }
-
-
-    #nav-topright li.nav-topright-labs a
-    {
-        width: 40px;
-        background-position: -114px -91px;
-    }
-
-    #nav-topright li.nav-topright-labs a:hover
-    {
-        background-position: -114px -117px;
-    }
-
-    #nav-topright li.nav-topright-doc a
-    {
-        width: 32px;
-        background-position: -162px -91px;
-    }
-
-    #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a
-    {
-        background-position: -162px -117px;
-    }
-
-    #nav-topright li.nav-topright-blog a
-    {
-        width: 40px;
-        background-position: -203px -91px;
-    }
-
-    #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a
-    {
-        background-position: -203px -117px;
-    }
-
-    #nav-topright li.nav-topright-shop a
-    {
-        width: 40px;
-        background-position: -252px -91px;
-    }
-
-    #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a
-    {
-        background-position: -252px -117px;
-    }
-
-    #nav-logo
-    {
-        background: transparent url(../images/sprites-combined.png ) no-repeat 0 -225px;
-        left: -3px;
-        position: absolute;
-        width: 75px;
-        height: 75px;
-        top: 13px;
-    }
-    #nav-logo a
-    {
-        width: 75px;
-        height: 75px;
-        display: block;
-        text-indent: -9999px;
-        overflow: hidden;
-    }
-
+    .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.2;
+    min-width:100%;
 
-    .shortCut-topleft-inactive
-    {
-        padding-left: 3px;
-        padding-right: 3px;
-        background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px;
-        height: 20px;
-    }
-    .shortCut-topleft-inactive span
-    {
-        font-variant: normal;
-    }
-	    .shortCut-topleft-inactive span a:hover,     .shortCut-topleft-active a:hover
-	{
-		text-decoration:none;
-	}
-    #shortCut
-    {
-        padding-top: 10px;
-        font-weight: bolder;
-        color: #b0adab;
-    }
-    #shortCut ul
-    {
-        list-style-type: none;
-        float: left;
-        margin-left: 100px;
-    }
-    #shortCut li
-    {
-        display: inline-block;
-        margin-right: 25px;
-        float: left;
-        white-space: nowrap;
-    }
-    #shortCut li a
-    {
-        color: #b0adab;
     }
-    #shortCut li a:hover
-    {
-        color: #44a51c;
+    
+    .flowList dd a{
     }
 
-    hr
-    {
-        background-color: #E6E6E6;
-        border: 1px solid #E6E6E6;
-        height: 1px;
-        width: 100%;
-        text-align: left;
-        margin: 15px 0px 15px 0px;
+    .wrap .content .flowList p{
+    padding:0px;
     }
 
     .content .alignedsummary
     {
         margin: 15px;
     }
-    pre
-    {
-        border: 1px solid #DDDDDD;
-        margin: 0 20px 10px 10px;
-        padding: 20px 15px 20px 20px;
-        overflow-x: auto;
-    }
-    table, pre
-    {
-        -moz-border-radius: 7px 7px 7px 7px;
-        background-color: #F6F6F6;
-        border: 1px solid #E6E6E6;
-        border-collapse: separate;
-        font-size: 11px;
-        /*min-width: 395px;*/
-        margin-bottom: 25px;
-        display: inline-block;
-    }
-    thead
-    {
-        margin-top: 5px;
-		font:600 12px/1.2 Arial;
-    }
-    th
-    {
-        padding: 5px 15px 5px 15px;
-        background-color: #E1E1E1;
-      /*  border-bottom: 1px solid #E6E6E6;*/
-        border-left: 1px solid #E6E6E6;
-      /*  border-right: 1px solid #E6E6E6;*/
-    }
-    td
-    {
-        padding: 3px 15px 3px 20px;
-  /*      border-left: 1px solid #E6E6E6;
-        border-right: 1px solid #E6E6E6;*/
-    }
-    tr.odd td:hover,  tr.even td:hover
-    {
-    /*    border-right: 1px solid #C3C3C3;
-        border-left: 1px solid #C3C3C3;*/
-    }
-		
-	td.rightAlign
-	{
-        padding: 3px 15px 3px 10px;
-	}
-    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;
-    }
-    table tr.odd td:hover, table tr.even td:hover
-    {
-        background-color: #E6E6E6;
-    }
-    		
-    span.comment
-    {
-        color: #8B0000;
-        font-style: italic;
-    }
-    span.string, span.char
-    {
-        color: #254117;
-    }
+
 
     .qmltype
     {
@@ -832,12 +925,14 @@
     }
     .qmlreadonly
     {
+        padding-left: 5px;
         float: right;
         color: #254117;
     }
 
     .qmldefault
     {
+        padding-left: 5px;
         float: right;
         color: red;
     }
@@ -849,16 +944,17 @@
     *.qmlitem p
     {
     }
-
     #feedbackBox
     {
         display: none;
         -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
         border: 1px solid #DDDDDD;
         position: fixed;
         top: 100px;
         left: 33%;
-        height: 190px;
+        height: 230px;
         width: 400px;
         padding: 5px;
         background-color: #e6e7e8;
@@ -870,7 +966,7 @@
         padding: 5px 5px 0 0;
         margin-bottom: 3px;
         color: #363534;
-        font-weight: 600;
+        font-weight: bold;
         float: right;
         text-decoration: none;
     }
@@ -882,12 +978,25 @@
         height: 120px;
         margin: 0px 25px 10px 15px;
     }
+    #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;
+    }
+    
     #blurpage
     {
         display: none;
@@ -904,6 +1013,8 @@
     {
         float: right;
         -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
         background-color: #F6F6F6;
         border: 1px solid #DDDDDD;
         margin: 0 20px 10px 10px;
@@ -914,55 +1025,71 @@
 
     .toc h3, .generic a
     {
-        font: 600 12px/1.2 Arial;
+        font: bold 12px/1.2 Arial;
     }
 
-	.generic{
-		max-width:75%;
-	}
-	.generic td{
-		padding:0;
-	}
-	
-	.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{}
-	.bottomAlign{}
-	.highlightedCode
-	{
-	margin:10px;
-	}
-	.LegaleseLeft{}
-	.valuelist{}
-	.annotated{}
-	.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 .level2
     {
@@ -979,10 +1106,11 @@
         font: normal 10px/1.2 Verdana;
         background: url(../images/bullet_dn.png) no-repeat 0 5px;
     }
-
     .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;
@@ -998,68 +1126,93 @@
     }
     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;
+        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;
     border-color: #E6E6E6;
-	width:100%;
-	}
-	
-	.centerAlign
-	{
-	text-align:center;	
-	}
-	
-	.rightAlign
-	{
-	text-align:right;	
-	}
-
-	
-	.leftAlign
-	{
-	text-align:left;	
-	}
-
-	.topAlign{
-	vertical-align:top
-	}
-	
-	.functionIndex a{
-	display:inline-block;
-	}
+    -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
+    {
+        min-height: 100px;
+        color: #797775;
+        font: normal 9px/1 Verdana;
+        text-align: center;
+        padding-top: 40px;
+        background-color: #E6E7E8;
+        margin: 0;
+    }
+/* end footer elements */
+
+
+
 
     /* start index box */
     .indexbox
     {
         width: 100%;
-		display:inline-block;
+        display:inline-block;
     }
 
     .indexboxcont
     {
         display: block;
-       /* overflow: hidden;*/
+
     }
 
     .indexboxbar
     {
         background: transparent url(../images/horBar.png ) repeat-x left bottom;
         margin-bottom: 25px;
-     /*   background-image: none;
-        border-bottom: 1px solid #e2e2e2;*/
+
+
     }
 
     .indexboxcont .section
@@ -1094,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
@@ -1110,7 +1263,7 @@
 
     .content .indexboxcont li
     {
-        font: normal 600 13px/1 Verdana;
+        font: normal bold 13px/1 Verdana;
     }
 
     .indexbox a:hover, .indexbox a:visited:hover
@@ -1124,12 +1277,12 @@
         color: #00732f;
         text-decoration: none;
     }
-	
-	.indexbox .indexIcon {
-	width: 11%;
-	}
+    
+    .indexbox .indexIcon {
+    width: 11%;
+    }
 
-	
+    
     .indexbox .indexIcon span
     {
         display: block;
@@ -1158,61 +1311,282 @@
         clear: both;
         visibility: hidden;
     }
-	
-.sidebar .search form input.loading
-{
-        background:url("../images/spinner.gif") no-repeat scroll right center transparent;
-}
+    
 
-    /* end of screen media */
-
-.flowList{
-vertical-align:top;
-}	
-.alphaChar{
-width:100%;
-background-color:#F6F6F6;
-border:1px solid #E6E6E6;
-font-size:12pt;
-padding-left:10px;
-margin-top:10px;
-margin-bottom:10px;
-}
 
-.flowList dl{
-}
-.flowList dd{
-display:inline-block;
-margin-left:10px;
-width:250px;
-}
-.wrap .content .flowList p{
-padding:0px;
-}
-pre.highlightedCode {
-	display: block;
-	overflow: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
+    {
+    display:none;
+    }
+    
+    body.creator
+    {
+    background: none;
+
+        font: normal 13px/1.2 Verdana;
+        color: #363534;
+        background-color: #FAFAFA;
+    }
+
+    .wrap .content ol li {
+    
+    }
+
+
+    .creator .header, .footer, .wrapper
+    {
+        max-width: 1500px;
+        margin: 0px;
+    }
+
+    .creator .wrapper
+    {
+    position:relative;
+    top:5px;
+    }
+    .creator .wrapper .bd
+    {
+
+    background:#FFFFFF;
+    }
+
+
+    .creator .header, .footer
+    {
+        display: block;
+        clear: both;
+        overflow: hidden;
+    }
+    .creator .wrap .content p
+
+    {
+        line-height: 20px;
+        padding: 5px;
+    }
+
+    .creator .header .qtref span
+    {
+        background:none;
+    }    
+
+
+    
+        .creator .footer
+    {
+        border-top:1px solid #E5E5E5;
+        height: 50px;
+        margin:0px;
+        padding:10px;
+    }
+    
+        .creator .footer p
+        {
+        text-align:justify;
+        max-width:900px;
+    }
+        
+     .creator .wrap
+    {
+
+        padding:0 5px 0 5px;
+        margin: 0px;
+    }
+    .creator .wrap .toolbar
+    {
+
+
+    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;
+    }
+    
+    .creator .wrap .content ol li { 
+        background:none; 
+        font: inherit; 
+        padding-left: 0px;
+    } 
+    
+    .creator .wrap .content .descr ol li {
+    margin-left: 45px;
+
+    }
+    .creator .content .alignedsummary
+    {
+        margin: 5px;
+        width:100%;
+    }
+    .creator .generic{
+        max-width:75%;
+    }
+    .creator .generic td{
+    /*    padding:0;*/
+    }
+    .creator .indexboxbar
+    {
+        border-bottom:1px solid #E5E5E5;
+        margin-bottom: 25px;
+        background: none;
+    }
+    
+    
+
+    .creator .header
+    {
+      width: 100%;
+      margin: 0;
+      height: auto;
+      background-color: #ffffff;
+      padding: 10px 0 5px 0;
+      overflow: visible;
+      border-bottom: solid #E5E5E5 1px;
+      z-index:1;
+
+
+
+
+
+
+
+
+    /*  position:fixed;*/
+    }
+
+
+    .creator .header .content
+    {
+    }
+    .creator .header .qtref
+    {
+      color: #00732F;
+      position: static;
+      float: left;
+      margin-left: 5px;
+      font: bold 18px/1 Arial;
+    }
+
+    .creator .header .qtref:visited
+    {
+      color: #00732F;
+      }
+    .creator .header .qtref:hover
+    {
+      color: #00732F;
+      text-decoration:none;
+      }
+    .creator .header .qtref span
+    {
+      background-image: none;
+      text-indent: 0;
+      text-decoration:none;
+    }
+
 
+
+
+
+
+    .creator .wrap .toolbar
+    {
+      display:block;
+      padding-top:0px;
+    }
+
+
+
+    .creator .wrap .breadcrumb ul li {
+      font-weight: normal;
+    }
+
+    .creator .wrap .breadcrumb ul li a {
+      /*color: #44a51c;*/
+    }
+
+    .creator .wrap .breadcrumb ul li.last a {
+      /*color: #363534;*/
+    }
+    
+    .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;
+    }
+/* end of creator spec*/
+    
 }
+
 /* end of screen media */
 
 /* start of print media */
 
 @media print
 {
-     input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft
+     input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult
     {
         display: none;
         background: none;
     }
     .content
     {
-        position: absolute;
-        top: 0px;
-        left: 0px;
         background: none;
         display: block;
+        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 0cf0f7dc9..2bdaef4d9 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;
 }