From 2a9f678f59ce795581ae5af4a57cef13b9cc14b7 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Mon, 26 Jun 2017 15:52:59 +0200
Subject: Fix navigation with offline style
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the switching to the non-simple offline style is done after
document load, the navigation to anchors completely breaks. So, do
the switch without the additional delay.

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

(limited to 'doc')

diff --git a/doc/global/qt-html-templates-offline-simple.qdocconf b/doc/global/qt-html-templates-offline-simple.qdocconf
index 4a65cc3c57..1fea752a16 100644
--- a/doc/global/qt-html-templates-offline-simple.qdocconf
+++ b/doc/global/qt-html-templates-offline-simple.qdocconf
@@ -6,7 +6,7 @@ qhp.extraFiles    += style/offline-simple.css
 HTML.headerstyles  = \
     "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline-simple.css\" />\n" \
     "  <script type=\"text/javascript\">\n" \
-    "    window.onload = function(){document.getElementsByTagName(\"link\").item(0).setAttribute(\"href\", \"style/offline.css\");};\n" \
+    "    document.getElementsByTagName(\"link\").item(0).setAttribute(\"href\", \"style/offline.css\");\n" \
     "  </script>\n"
 
 HTML.postheader = \
-- 
cgit v1.2.3


From 87229adca83a6762d5517eba7c7dc0832f3819ff Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Tue, 27 Jun 2017 15:29:57 +0200
Subject: Change MinGW link to MinGW-w64
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We're only supporting builds with MinGW-w64 these days.

Change-Id: I1198551ba85132c3f0f81e32f11aa149126ca61f
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 doc/global/externalsites/external-resources.qdoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc
index d9859ba295..6019f5013f 100644
--- a/doc/global/externalsites/external-resources.qdoc
+++ b/doc/global/externalsites/external-resources.qdoc
@@ -199,7 +199,7 @@
 */
 
 /*!
-    \externalpage http://www.mingw.org/
+    \externalpage https://mingw-w64.org/
     \title MinGW
 */
 
-- 
cgit v1.2.3


From b7c33df724f85102f9328a75891f70888787b1c1 Mon Sep 17 00:00:00 2001
From: Nico Vertriest <nico.vertriest@qt.io>
Date: Wed, 28 Jun 2017 13:49:09 +0200
Subject: Doc: add tutorials to overview page Qt Widgets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I62037ce2190689b2e9c8d62a9d67e1d477e1be42
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 doc/global/externalsites/qtcreator.qdoc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc
index bfa467da57..4b9160cea4 100644
--- a/doc/global/externalsites/qtcreator.qdoc
+++ b/doc/global/externalsites/qtcreator.qdoc
@@ -555,3 +555,7 @@
     \externalpage http://doc.qt.io/qtcreator/creator-project-creating.html#creating-c-classes
     \title Qt Creator: Creating C++ Classes
 */
+/*!
+    \externalpage http://doc.qt.io/qtcreator/creator-writing-program.html
+    \title Creating a Qt Widget Based Application
+*/
-- 
cgit v1.2.3