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

Conflicts:
	src/corelib/io/qiodevice.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux_p.h
	src/plugins/platforms/android/qandroidplatformtheme.cpp
	src/tools/bootstrap/bootstrap.pro
	src/widgets/styles/qmacstyle_mac.mm

Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b

9 files changed, 29 insertions, 3 deletions

diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc
index 46609de160..a98fbd0a56 100644
--- a/doc/global/externalsites/qtcreator.qdoc
+++ b/doc/global/externalsites/qtcreator.qdoc
@@ -483,3 +483,15 @@
     \externalpage http://qt-project.org/doc/qtcreator/creator-developing-winrt.html
     \title Qt Creator: Connecting Windows Runtime Devices
 */
+/*!
+    \externalpage http://qt-project.org/doc/qtcreator/creator-clang-codemodel.html
+    \title Qt Creator: Parsing C++ Files
+*/
+/*!
+    \externalpage http://qt-project.org/doc/qtcreator/creator-quick-ui-forms.html
+    \title Qt Creator: Qt Quick UI Forms
+*/
+/*!
+    \externalpage http://qt-project.org/doc/qtcreator/creator-clang-static-analyzer.html
+    \title Qt Creator: Using Clang Static Analyzer
+*/
diff --git a/doc/global/template/images/Qt-logo.png b/doc/global/template/images/Qt-logo.png
index 64c1c4aaa3..01256ab08d 100644
--- a/doc/global/template/images/Qt-logo.png
+++ b/doc/global/template/images/Qt-logo.png
diff --git a/doc/global/template/images/logo.png b/doc/global/template/images/logo.png
index 1e7ed4cf21..698dde9215 100644
--- a/doc/global/template/images/logo.png
+++ b/doc/global/template/images/logo.png
diff --git a/doc/global/template/images/sprites-combined.png b/doc/global/template/images/sprites-combined.png
index 3a48b21f6b..c4f01c4bb9 100644
--- a/doc/global/template/images/sprites-combined.png
+++ b/doc/global/template/images/sprites-combined.png
diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css
index 5adb699972..16f26f43bb 100644
--- a/doc/global/template/style/offline.css
+++ b/doc/global/template/style/offline.css
@@ -2,7 +2,6 @@ body {
     font: normal 400 14px/1.2 Arial;
     margin-top: 85px;
     font-family: Arial, Helvetica;
-    color: #313131;
     text-align: left;
     margin-left: 5px;
     margin-right: 5px;
@@ -365,7 +364,9 @@ h3.fn, span.fn {
     margin: 0px;
     margin-top: 45px;
 }
-
+h3.fn code {
+    float: right;
+}
 h3.fn:target {
     background-color: #F6F6D6;
 }
@@ -711,8 +712,21 @@ Landing page
     float: left;
 }
 
-.icons1of3  h2 {
+.icons1of3 h2, .doc-column h2 {
     font-size: 15px;
     margin: 0px;
     padding: 0px;
 }
+
+div.multi-column {
+    position: relative;
+}
+
+div.multi-column div {
+    display: -moz-inline-box;
+    display: inline-block;
+    vertical-align: top;
+    margin-top: 1em;
+    margin-right: 4em;
+    width: 24em;
+}
diff --git a/doc/src/images/analogclock-example.png b/doc/src/images/analogclock-example.png
index ffd7baa716..b195f8bf24 100644
--- a/doc/src/images/analogclock-example.png
+++ b/doc/src/images/analogclock-example.png
diff --git a/doc/src/images/application.png b/doc/src/images/application.png
index 2fb7f2f18e..bff37369a4 100644
--- a/doc/src/images/application.png
+++ b/doc/src/images/application.png
diff --git a/doc/src/images/digitalclock-example.png b/doc/src/images/digitalclock-example.png
index 473986608c..917035a0f0 100644
--- a/doc/src/images/digitalclock-example.png
+++ b/doc/src/images/digitalclock-example.png
diff --git a/doc/src/images/scribble-example.png b/doc/src/images/scribble-example.png
index a2cb1de3e8..54091baa6b 100644
--- a/doc/src/images/scribble-example.png
+++ b/doc/src/images/scribble-example.png