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

Change-Id: I0cd11cbe95693b78450ea81a0187760f4a6a8b5f

configure

@@ -4650,8 +4650,8 @@ if [ "$CFG_DBUS" != "no" ]; then
         fi
         QMakeVar set QT_HOST_CFLAGS_DBUS "$QT_CFLAGS_DBUS"
     else
-        if [ "$CFG_DBUS" = "auto" ]; then
-            CFG_DBUS=no
+        if [ "$CFG_DBUS" != "linked" ]; then
+            CFG_DBUS=runtime
         elif [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
             # CFG_DBUS is "yes" or "linked" here
 

dist/changes-5.4.0

@@ -404,7 +404,8 @@ Android
  - [QTBUG-41817] QClipboard::mimeData() now returns an empty object instead
    of null pointer from QClipboard when clipboard is empty for consistency
    with other platforms.
-
+ - New bearer plugin. It's now possible to get more information about the
+   different network configurations on Android.
  - Important Behavior Changes:
    * [QTBUG-36274] The main event loop is now stopped when the app is
      suspended

doc/global/config.qdocconf

@@ -9,8 +9,7 @@ dita.metadata.default.audience = programmer
 
 #Set the main Qt index.html
 navigation.homepage = "Qt $QT_VER"
-buildversion = "Qt $QT_VERSION Reference Documentation"
 
 sourcedirs += includes
 
-url = http://qt-project.org/doc/qt-5
+url = http://doc.qt.io/qt-5

doc/global/externalsites/qch-urls.qdoc

@@ -38,7 +38,7 @@
     \title external: Publishing Applications to Ovi Store
 */
 /*!
-    \externalpage http://qt-project.org/doc/qtcreator
+    \externalpage http://doc.qt.io/qtcreator
     \title external: Qt Creator Manual
 */
 /*!
@@ -50,31 +50,31 @@
     \title external: Qt Mobility QML Plugins
 */
 /*!
-    \externalpage http://qt-project.org/doc/qtcreator/creator-project-managing.html
+    \externalpage http://doc.qt.io/qtcreator/creator-project-managing.html
     \title external: Creating Qt Projects in Creator
 */
 /*!
-    \externalpage http://qt-project.org/doc/qtcreator/creator-building-running.html
+    \externalpage http://doc.qt.io/qtcreator/creator-building-running.html
     \title external: Building and Running Applications in Creator
 */
 /*!
-    \externalpage http://qt-project.org/doc/qtcreator/creator-running-targets.html
+    \externalpage http://doc.qt.io/qtcreator/creator-running-targets.html
     \title external: Set Compiler Targets in Creator
 */
 /*!
-    \externalpage http://qt-project.org/doc/qtcreator/creator-build-settings.html
+    \externalpage http://doc.qt.io/qtcreator/creator-build-settings.html
     \title external: Build Settings in Creator
 */
 /*!
-    \externalpage http://qt-project.org/doc/qtcreator/creator-run-settings.html
+    \externalpage http://doc.qt.io/qtcreator/creator-run-settings.html
     \title external: Run Settings in Creator
 */
 /*!
-    \externalpage http://qt-project.org/doc/qtcreator/creator-using-qt-designer.html
+    \externalpage http://doc.qt.io/qtcreator/creator-using-qt-designer.html
     \title external: Designer in Creator
 */
 /*!
-    \externalpage http://qt-project.org/doc/qtcreator/creator-debugging.html
+    \externalpage http://doc.qt.io/qtcreator/creator-debugging.html
     \title external: Debugging Applications in Creator
 */
 /*!
@@ -90,6 +90,6 @@
     \title external: Qt Mobility Examples
 */
 /*!
-    \externalpage http://qt-project.org/doc/qtcreator/creator-overview.html
+    \externalpage http://doc.qt.io/qtcreator/creator-overview.html
     \title external: Qt Creator Overview
 */