diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:52:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:25 +0200 |
| commit | 7f269a5db8b88fbb14ee741f78e726b1a46c7d4d (patch) | |
| tree | fa63387e6f70187e656dd9e6c4f1cd1b1f96c263 /doc | |
| parent | 9ca3443a37284bedaf74475c26af173b00757178 (diff) | |
| parent | 03b4838cb51513bd5d2edf76dccc4bc4a1181681 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/global/externalsites/external-resources.qdoc | 2 | ||||
| -rw-r--r-- | doc/global/externalsites/qtcreator.qdoc | 4 | ||||
| -rw-r--r-- | doc/global/qt-html-templates-offline-simple.qdocconf | 2 |
3 files changed, 6 insertions, 2 deletions
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 */ 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 +*/ 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 = \ |