From 2740584e6de5ec2999e0e44f363bc18b9252dc23 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Fri, 18 Aug 2017 16:51:37 +0200
Subject: Doc: Update Qt Creator Manual link targets to match version 4.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ib784779b09f4bce38ada4833777f873ee510af16
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 doc/global/externalsites/qtcreator.qdoc | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

(limited to 'doc')

diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc
index 4b9160cea4..7f2322d041 100644
--- a/doc/global/externalsites/qtcreator.qdoc
+++ b/doc/global/externalsites/qtcreator.qdoc
@@ -117,10 +117,6 @@
     \externalpage http://doc.qt.io/qtcreator/quick-screens.html
     \title Qt Creator: Creating Screens
 */
-/*!
-    \externalpage http://doc.qt.io/qtcreator/creator-qtquick-designer-extensions.html
-    \title Qt Creator: Using Qt Quick Designer Extensions
-*/
 /*!
     \externalpage http://doc.qt.io/qtcreator/qmldesigner-pathview-editor.html
     \title Qt Creator: Editing PathView Properties
@@ -295,7 +291,7 @@
 */
 /*!
     \externalpage http://doc.qt.io/qtcreator/creator-connecting-mobile.html
-    \title Qt Creator: Connecting Mobile Devices
+    \title Qt Creator: Connecting Devices
 */
 /*!
     \externalpage http://doc.qt.io/qtcreator/creator-usability.html
@@ -323,7 +319,7 @@
 */
 /*!
     \externalpage http://doc.qt.io/qtcreator/creator-deployment.html
-    \title Qt Creator: Deploying to Mobile Devices
+    \title Qt Creator: Deploying to Devices
 */
 /*!
     \externalpage http://doc.qt.io/qtcreator/creator-tutorials.html
@@ -405,7 +401,7 @@
 */
 /*!
     \externalpage http://doc.qt.io/qtcreator/creator-project-cmake.html
-    \title Qt Creator: Setting Up a CMake Project
+    \title Qt Creator: Setting Up CMake
 */
 /*!
     \externalpage http://doc.qt.io/qtcreator/creator-targets.html
@@ -417,7 +413,7 @@
 */
 /*!
     \externalpage http://doc.qt.io/qtcreator/creator-project-qbs.html
-    \title Qt Creator: Setting Up a Qbs Project
+    \title Qt Creator: Setting Up Qbs
 */
 /*!
     \externalpage http://doc.qt.io/qtcreator/creator-project-creating.html
@@ -523,22 +519,16 @@
     \externalpage http://doc.qt.io/qtcreator/creator-beautifier.html
     \title Qt Creator: Beautifying Source Code
 */
-/*!
-    \externalpage http://doc.qt.io/qtcreator/creator-developing-winrt.html
-    \title Qt Creator: Connecting Windows Runtime Devices
-*/
+
 /*!
     \externalpage http://doc.qt.io/qtcreator/creator-clang-codemodel.html
-    \title Qt Creator: Parsing C++ Files
+    \title Qt Creator: Parsing C++ Files with the Clang Code Model
 */
 /*!
     \externalpage http://doc.qt.io/qtcreator/creator-quick-ui-forms.html
     \title Qt Creator: Qt Quick UI Forms
 */
-/*!
-    \externalpage http://doc.qt.io/qtcreator/qtcreator-uiforms-example.html
-    \title Qt Creator: Using Qt Quick UI Forms
-*/
+
 /*!
     \externalpage http://doc.qt.io/qtcreator/creator-clang-static-analyzer.html
     \title Qt Creator: Using Clang Static Analyzer
-- 
cgit v1.2.3


From 3b962d16dba91aa13ad6bc04abc7608b6de5bdf4 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 21 Jul 2017 09:57:00 +0200
Subject: Fix jumping to anchors with offline style
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the style changes after the browser already jumped to an anchor,
the resulting browser position will be messed up.
So, after we changed the style we need to make sure that we jump
to the anchor again.
Since browsers do not jump to anchors that they already jumped to,
that means first jumping to the top, then to the actual anchor.

Task-number: QTCREATORBUG-18448
Change-Id: I86c736adab6940903276f8a896b4054ddae11ebe
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 doc/global/qt-html-templates-offline-simple.qdocconf | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'doc')

diff --git a/doc/global/qt-html-templates-offline-simple.qdocconf b/doc/global/qt-html-templates-offline-simple.qdocconf
index 1fea752a16..c3c2d3cca0 100644
--- a/doc/global/qt-html-templates-offline-simple.qdocconf
+++ b/doc/global/qt-html-templates-offline-simple.qdocconf
@@ -7,6 +7,16 @@ HTML.headerstyles  = \
     "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline-simple.css\" />\n" \
     "  <script type=\"text/javascript\">\n" \
     "    document.getElementsByTagName(\"link\").item(0).setAttribute(\"href\", \"style/offline.css\");\n" \
+    "    // loading style sheet breaks anchors that were jumped to before\n" \
+    "    // so force jumping to anchor again\n" \
+    "    setTimeout(function() {\n" \
+    "        var anchor = location.hash;\n" \
+    "        // need to jump to different anchor first (e.g. none)\n" \
+    "        location.hash = \"#\";\n" \
+    "        setTimeout(function() {\n" \
+    "            location.hash = anchor;\n" \
+    "        }, 0);\n" \
+    "    }, 0);\n" \
     "  </script>\n"
 
 HTML.postheader = \
-- 
cgit v1.2.3