Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: Ib43c6f126998eefcfed9a7c1f2bcbac8b4dd05ec

2 files changed, 11 insertions, 0 deletions

diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc
index 95200622f3..b8cd9dec00 100644
--- a/doc/global/externalsites/qtcreator.qdoc
+++ b/doc/global/externalsites/qtcreator.qdoc
@@ -106,6 +106,10 @@
     \title Qt Creator: Creating a Qt Quick Application
 */
 /*!
+    \externalpage http://doc.qt.io/qtcreator/qtquick-iso-icon-browser.html
+    \title Qt Creator: Browsing ISO 7000 Icons
+*/
+/*!
     \externalpage http://doc.qt.io/qtcreator/quick-export-to-qml.html
     \title Qt Creator: Exporting Designs from Graphics Software
 */
@@ -210,6 +214,10 @@
     \title Qt Creator: Editing MIME Types
 */
 /*!
+    \externalpage http://doc.qt.io/qtcreator/creator-modeling.html
+    \title Qt Creator: Modeling
+*/
+/*!
     \externalpage http://doc.qt.io/qtcreator/creator-qml-debugging-example.html
     \title Qt Creator: Debugging a Qt Quick Example Application
 */
diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index cfd0da0f4b..a98382e083 100644
--- a/doc/global/template/style/online.css
+++ b/doc/global/template/style/online.css
@@ -1261,6 +1261,9 @@ table td,table th {
 table.alignedsummary,table.propsummary {
   width:initial
 }
+table.valuelist td.tblval {
+  font-size:0.75em
+}
 div.main_index .row {
   border-bottom:1px solid #eee
 }