10 files changed, 53 insertions, 5 deletions

diff --git a/doc/global/config.qdocconf b/doc/global/config.qdocconf
index 670b13a9ea..295a5ed08b 100644
--- a/doc/global/config.qdocconf
+++ b/doc/global/config.qdocconf
@@ -12,3 +12,5 @@ navigation.homepage = "Qt $QT_VER"
 buildversion = "Qt $QT_VERSION Reference Documentation"
 
 sourcedirs += includes
+
+url = http://qt-project.org/doc/qt-5
diff --git a/doc/global/externalsites.qdocconf b/doc/global/externalsites.qdocconf
new file mode 100644
index 0000000000..46ce8401c0
--- /dev/null
+++ b/doc/global/externalsites.qdocconf
@@ -0,0 +1,3 @@
+# Include the external websites
+sourcedirs += externalsites
+
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc
index c7211086fb..a7aaedfe5b 100644
--- a/doc/global/externalsites/external-resources.qdoc
+++ b/doc/global/externalsites/external-resources.qdoc
@@ -492,3 +492,8 @@
     \externalpage http://lldb.llvm.org/
     \title The LLDB Debugger
 */
+
+/*!
+    \externalpage http://qt.digia.com/Try-Buy/Qt-Account-Sign-up/
+    \title Qt Account Sign-up
+*/
diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc
index 30e65034fc..46609de160 100644
--- a/doc/global/externalsites/qtcreator.qdoc
+++ b/doc/global/externalsites/qtcreator.qdoc
@@ -50,7 +50,7 @@
     \title Qt Creator: Connecting Embedded Linux Devices
 */
 /*!
-    \externalpage http://qt-project.org/doc/qtcreator/creator-deployment-maemo.html
+    \externalpage http://qt-project.org/doc/qtcreator/creator-deployment-embedded-linux.html
     \title Qt Creator: Deploying Applications to Embedded Linux Devices
 */
 /*!
diff --git a/doc/global/fileextensions.qdocconf b/doc/global/fileextensions.qdocconf
index ec47dc9c7f..0a106d5bef 100644
--- a/doc/global/fileextensions.qdocconf
+++ b/doc/global/fileextensions.qdocconf
@@ -8,5 +8,3 @@ examples.imageextensions = "*.png *.jpg *.gif"
 headers.fileextensions  = "*.ch *.h *.h++ *.hh *.hpp *.hxx"
 sources.fileextensions  = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc"
 
-#include the external websites
-sourcedirs += externalsites
diff --git a/doc/global/html-config.qdocconf b/doc/global/html-config.qdocconf
index 1560db8d98..9b3b05b7d3 100644
--- a/doc/global/html-config.qdocconf
+++ b/doc/global/html-config.qdocconf
@@ -2,6 +2,8 @@
 
 HTML.nonavigationbar      = "false"
 
+HTML.tocdepth = 2
+
 HTML.extraimages += template/images/arrow_bc.png \
                     template/images/home.png \
                     template/images/ico_out.png \
diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf
index 58d9a71c8c..71a9dc30d1 100644
--- a/doc/global/macros.qdocconf
+++ b/doc/global/macros.qdocconf
@@ -3,12 +3,11 @@ macro.Aring.HTML        = "Å"
 macro.aring.HTML        = "å"
 macro.Auml.HTML         = "Ä"
 macro.author            = "\\b{Author:}"
-macro.br.HTML           = "<br />"
 macro.BR.HTML           = "<br />"
 macro.copyright.HTML    = "&copy;"
 macro.eacute.HTML       = "&eacute;"
 macro.gui               = "\\b"
-macro.hr.HTML           = "<hr />"
+macro.HR.HTML           = "<hr />"
 macro.iacute.HTML       = "&iacute;"
 macro.key               = "\\b"
 macro.menu              = "\\b"
diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf
index 1039c88e8d..300c4402c1 100644
--- a/doc/global/qt-cpp-defines.qdocconf
+++ b/doc/global/qt-cpp-defines.qdocconf
@@ -28,9 +28,12 @@ Cpp.ignoretokens        += \
                           Q_CORE_EXPORT_INLINE \
                           Q_DBUS_EXPORT \
                           Q_DECL_CONSTEXPR \
+                          Q_DECL_CONST_FUNCTION \
                           Q_DECL_DEPRECATED \
                           Q_DECL_NOEXCEPT \
+                          Q_DECL_FINAL \
                           Q_DECL_NOTHROW \
+                          Q_DECL_PURE_FUNCTION \
                           Q_DECL_UNUSED \
                           Q_DECLARATIVE_EXPORT \
                           Q_EXPLICIT \
diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css
index c993a07d47..5957e3840d 100644
--- a/doc/global/template/style/offline.css
+++ b/doc/global/template/style/offline.css
@@ -97,6 +97,10 @@ a[href*="http://"], a[href*="ftp://"], a[href*="https://"] {
     text-height: 24px;
 }
 
+.flags:target {
+    background-color: #FFFFD6;
+}
+
 /*
 -------------------------------
 NOTE styles
@@ -305,6 +309,10 @@ headers
         margin-left: 0px;
         margin-right: 0px;
     }
+    .subtitle, .small-subtitle {
+        display: block;
+        clear: left;
+    }
 }
 
 h1 {
@@ -323,6 +331,10 @@ h2, p.h2 {
     max-width: 99%;
 }
 
+h2:target {
+    background-color: #F2F3D4;
+}
+
 h3 {
     font: 500 14px/1.2 Arial;
     font-weight: 100;
@@ -349,6 +361,10 @@ h3.fn, span.fn {
     margin-top: 45px;
 }
 
+h3.fn:target {
+    background-color: #F6F6D6;
+}
+
 .name {
     color: #1A1A1A
 }
@@ -409,6 +425,10 @@ table, pre {
      color: #66666E;
  }
 
+ table tr:target {
+     background-color: #F6F6D6;
+ }
+
  table thead {
      text-align: left;
      padding-left: 20px;
diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index 0dc01d396b..5d0cd7ecfb 100644
--- a/doc/global/template/style/online.css
+++ b/doc/global/template/style/online.css
@@ -48,6 +48,10 @@ links
     text-height: 24px;
 }
 
+.flags:target {
+    background-color: #FFFFD6;
+}
+
 /*
 -------------------------------
 NOTE styles
@@ -204,6 +208,10 @@ h2, p.h2 {
     overflow: hidden;
 }
 
+h2:target {
+    background-color: #F2F3D4;
+}
+
 h3 {
     font: 500 14px/1.2 Arial;
     font-weight: 100;
@@ -212,6 +220,10 @@ h3 {
     margin-top: 30px;
 }
 
+h3.fn:target {
+    background-color: #F6F6D6;
+}
+
 h3.fn, span.fn {
     border-width: 1px;
     border-style: solid;
@@ -293,6 +305,10 @@ table, pre {
      color: #66666E;
  }
 
+ table tr:target {
+     background-color: #F6F6D6;
+ }
+
  table thead {
      text-align: left;
      padding-left: 20px;