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

34 files changed, 17 insertions, 11 deletions

diff --git a/examples/gui/doc/images/analogclock-window-example.png b/examples/gui/doc/images/analogclock-window-example.png
index ffd7baa716..f5e92e400a 100644
--- a/examples/gui/doc/images/analogclock-window-example.png
+++ b/examples/gui/doc/images/analogclock-window-example.png
diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp
index 4590a91f4f..2f5d6cda1c 100644
--- a/examples/network/bearermonitor/bearermonitor.cpp
+++ b/examples/network/bearermonitor/bearermonitor.cpp
@@ -127,6 +127,9 @@ static void updateItem(QTreeWidgetItem *item, const QNetworkConfiguration &confi
 
 void BearerMonitor::configurationAdded(const QNetworkConfiguration &config, QTreeWidgetItem *parent)
 {
+    if (!config.isValid())
+        return;
+
     QTreeWidgetItem *item = new QTreeWidgetItem;
     updateItem(item, config);
 
diff --git a/examples/network/securesocketclient/sslclient.cpp b/examples/network/securesocketclient/sslclient.cpp
index 23ca7e41e7..0cec70c742 100644
--- a/examples/network/securesocketclient/sslclient.cpp
+++ b/examples/network/securesocketclient/sslclient.cpp
@@ -181,7 +181,7 @@ void SslClient::sendData()
     form->sessionInput->clear();
 }
 
-void SslClient::socketError(QAbstractSocket::SocketError error)
+void SslClient::socketError(QAbstractSocket::SocketError)
 {
     QMessageBox::critical(this, tr("Connection error"), socket->errorString());
 }
diff --git a/examples/network/securesocketclient/sslclient.ui b/examples/network/securesocketclient/sslclient.ui
index 4b81fe46eb..19bae83a09 100644
--- a/examples/network/securesocketclient/sslclient.ui
+++ b/examples/network/securesocketclient/sslclient.ui
@@ -26,7 +26,7 @@
      <item row="0" column="1">
       <widget class="QLineEdit" name="hostNameEdit">
        <property name="text">
-        <string>imap.example.com</string>
+        <string>www.qt.io</string>
        </property>
       </widget>
      </item>
@@ -46,7 +46,7 @@
         <number>65535</number>
        </property>
        <property name="value">
-        <number>993</number>
+        <number>443</number>
        </property>
       </widget>
      </item>
diff --git a/examples/opengl/legacy/framebufferobject2/cubelogo.png b/examples/opengl/legacy/framebufferobject2/cubelogo.png
index 3ae0f9ba3f..2ccbede774 100644
--- a/examples/opengl/legacy/framebufferobject2/cubelogo.png
+++ b/examples/opengl/legacy/framebufferobject2/cubelogo.png
diff --git a/examples/opengl/legacy/pbuffers/cubelogo.png b/examples/opengl/legacy/pbuffers/cubelogo.png
index 3ae0f9ba3f..2ccbede774 100644
--- a/examples/opengl/legacy/pbuffers/cubelogo.png
+++ b/examples/opengl/legacy/pbuffers/cubelogo.png
diff --git a/examples/sql/doc/images/drilldown-example.png b/examples/sql/doc/images/drilldown-example.png
index fd315a437e..fed51d3629 100644
--- a/examples/sql/doc/images/drilldown-example.png
+++ b/examples/sql/doc/images/drilldown-example.png
diff --git a/examples/sql/drilldown/images/qt-creator.png b/examples/sql/drilldown/images/qt-creator.png
index fa0f6ed7ce..0602bdcad1 100644
--- a/examples/sql/drilldown/images/qt-creator.png
+++ b/examples/sql/drilldown/images/qt-creator.png
diff --git a/examples/sql/drilldown/images/qt-logo.png b/examples/sql/drilldown/images/qt-logo.png
index 53bc39c38c..7603fa0c90 100644
--- a/examples/sql/drilldown/images/qt-logo.png
+++ b/examples/sql/drilldown/images/qt-logo.png
diff --git a/examples/sql/drilldown/images/qt-project.png b/examples/sql/drilldown/images/qt-project.png
index c34d3f099d..e066fbe3f9 100644
--- a/examples/sql/drilldown/images/qt-project.png
+++ b/examples/sql/drilldown/images/qt-project.png
diff --git a/examples/sql/drilldown/images/qt-quick.png b/examples/sql/drilldown/images/qt-quick.png
index f66127e8e7..90d9fd075d 100644
--- a/examples/sql/drilldown/images/qt-quick.png
+++ b/examples/sql/drilldown/images/qt-quick.png
diff --git a/examples/widgets/animation/animatedtiles/images/kinetic.png b/examples/widgets/animation/animatedtiles/images/kinetic.png
index 55cfa5515f..d5fc0af0f2 100644
--- a/examples/widgets/animation/animatedtiles/images/kinetic.png
+++ b/examples/widgets/animation/animatedtiles/images/kinetic.png
diff --git a/examples/widgets/animation/easing/images/qt-logo.png b/examples/widgets/animation/easing/images/qt-logo.png
index 14ddf2a028..6b72d5fb72 100644
--- a/examples/widgets/animation/easing/images/qt-logo.png
+++ b/examples/widgets/animation/easing/images/qt-logo.png
diff --git a/examples/widgets/doc/images/dropsite-example.png b/examples/widgets/doc/images/dropsite-example.png
index 2c42c7be69..c555dd3609 100644
--- a/examples/widgets/doc/images/dropsite-example.png
+++ b/examples/widgets/doc/images/dropsite-example.png
diff --git a/examples/widgets/doc/images/icons_qt_extended_16x16.png b/examples/widgets/doc/images/icons_qt_extended_16x16.png
index 92743690e3..8bae9499e4 100644
--- a/examples/widgets/doc/images/icons_qt_extended_16x16.png
+++ b/examples/widgets/doc/images/icons_qt_extended_16x16.png
diff --git a/examples/widgets/doc/images/icons_qt_extended_17x17.png b/examples/widgets/doc/images/icons_qt_extended_17x17.png
index e9bb24a282..7ef4222f93 100644
--- a/examples/widgets/doc/images/icons_qt_extended_17x17.png
+++ b/examples/widgets/doc/images/icons_qt_extended_17x17.png
diff --git a/examples/widgets/doc/images/icons_qt_extended_32x32.png b/examples/widgets/doc/images/icons_qt_extended_32x32.png
index cd3d0f3255..7b0c54bac3 100644
--- a/examples/widgets/doc/images/icons_qt_extended_32x32.png
+++ b/examples/widgets/doc/images/icons_qt_extended_32x32.png
diff --git a/examples/widgets/doc/images/icons_qt_extended_33x33.png b/examples/widgets/doc/images/icons_qt_extended_33x33.png
index a67565cc2b..1a38f6e44b 100644
--- a/examples/widgets/doc/images/icons_qt_extended_33x33.png
+++ b/examples/widgets/doc/images/icons_qt_extended_33x33.png
diff --git a/examples/widgets/doc/images/icons_qt_extended_48x48.png b/examples/widgets/doc/images/icons_qt_extended_48x48.png
index 5aa2d73f71..85dcb5f26c 100644
--- a/examples/widgets/doc/images/icons_qt_extended_48x48.png
+++ b/examples/widgets/doc/images/icons_qt_extended_48x48.png
diff --git a/examples/widgets/doc/images/icons_qt_extended_64x64.png b/examples/widgets/doc/images/icons_qt_extended_64x64.png
index 5aa2d73f71..d0bfd97f10 100644
--- a/examples/widgets/doc/images/icons_qt_extended_64x64.png
+++ b/examples/widgets/doc/images/icons_qt_extended_64x64.png
diff --git a/examples/widgets/doc/images/icons_qt_extended_8x8.png b/examples/widgets/doc/images/icons_qt_extended_8x8.png
index 8de7fce038..dcbb5811c6 100644
--- a/examples/widgets/doc/images/icons_qt_extended_8x8.png
+++ b/examples/widgets/doc/images/icons_qt_extended_8x8.png
diff --git a/examples/widgets/doc/src/application.qdoc b/examples/widgets/doc/src/application.qdoc
index 0d244bce00..e0379e9d75 100644
--- a/examples/widgets/doc/src/application.qdoc
+++ b/examples/widgets/doc/src/application.qdoc
@@ -75,12 +75,12 @@
 
     \snippet mainwindows/application/mainwindow.cpp 0
 
-    We start by including \c <QtGui>, a header file that contains the
-    definition of all classes in the Qt Core and Qt GUI
+    We start by including \c <QtWidgets>, a header file that contains the
+    definition of all classes in the Qt Core, Qt GUI and Qt Widgets
     modules. This saves us from the trouble of having to include
     every class individually. We also include \c mainwindow.h.
 
-    You might wonder why we don't include \c <QtGui> in \c
+    You might wonder why we don't include \c <QtWidgets> in \c
     mainwindow.h and be done with it. The reason is that including
     such a large header from another header file can rapidly degrade
     performances. Here, it wouldn't do any harm, but it's still
diff --git a/examples/widgets/doc/src/dockwidgets.qdoc b/examples/widgets/doc/src/dockwidgets.qdoc
index 2987ec1211..a11524f4f4 100644
--- a/examples/widgets/doc/src/dockwidgets.qdoc
+++ b/examples/widgets/doc/src/dockwidgets.qdoc
@@ -55,8 +55,8 @@
 
     \snippet mainwindows/dockwidgets/mainwindow.cpp 0
 
-    We start by including \c <QtGui>, a header file that contains the
-    definition of all classes in the Qt Core and Qt GUI
+    We start by including \c <QtWidgets>, a header file that contains the
+    definition of all classes in the Qt Core, Qt GUI and Qt Widgets
     modules. This saves us from having to include
     every class individually and is especially convenient if we add new
     widgets. We also include \c mainwindow.h.
diff --git a/examples/widgets/draganddrop/puzzle/example.jpg b/examples/widgets/draganddrop/puzzle/example.jpg
index e09fb70757..023203c57a 100644
--- a/examples/widgets/draganddrop/puzzle/example.jpg
+++ b/examples/widgets/draganddrop/puzzle/example.jpg
diff --git a/examples/widgets/graphicsview/boxes/qt-logo.jpg b/examples/widgets/graphicsview/boxes/qt-logo.jpg
index 4014b4659c..8d7fab052a 100644
--- a/examples/widgets/graphicsview/boxes/qt-logo.jpg
+++ b/examples/widgets/graphicsview/boxes/qt-logo.jpg
diff --git a/examples/widgets/graphicsview/boxes/qt-logo.png b/examples/widgets/graphicsview/boxes/qt-logo.png
index 7d3e97eb36..0b0b15480c 100644
--- a/examples/widgets/graphicsview/boxes/qt-logo.png
+++ b/examples/widgets/graphicsview/boxes/qt-logo.png
diff --git a/examples/widgets/itemviews/puzzle/example.jpg b/examples/widgets/itemviews/puzzle/example.jpg
index e09fb70757..023203c57a 100644
--- a/examples/widgets/itemviews/puzzle/example.jpg
+++ b/examples/widgets/itemviews/puzzle/example.jpg
diff --git a/examples/widgets/painting/basicdrawing/images/qt-logo.png b/examples/widgets/painting/basicdrawing/images/qt-logo.png
index a8b452e07a..abfc8caadb 100644
--- a/examples/widgets/painting/basicdrawing/images/qt-logo.png
+++ b/examples/widgets/painting/basicdrawing/images/qt-logo.png
diff --git a/examples/widgets/widgets/icons/images/qt_extended_16x16.png b/examples/widgets/widgets/icons/images/qt_extended_16x16.png
index 95d3bae838..bee4e7d6cd 100644
--- a/examples/widgets/widgets/icons/images/qt_extended_16x16.png
+++ b/examples/widgets/widgets/icons/images/qt_extended_16x16.png
diff --git a/examples/widgets/widgets/icons/images/qt_extended_32x32.png b/examples/widgets/widgets/icons/images/qt_extended_32x32.png
index 7b7a790c12..6e7d000c04 100644
--- a/examples/widgets/widgets/icons/images/qt_extended_32x32.png
+++ b/examples/widgets/widgets/icons/images/qt_extended_32x32.png
diff --git a/examples/widgets/widgets/icons/images/qt_extended_48x48.png b/examples/widgets/widgets/icons/images/qt_extended_48x48.png
index 8434dc26db..7a93d88900 100644
--- a/examples/widgets/widgets/icons/images/qt_extended_48x48.png
+++ b/examples/widgets/widgets/icons/images/qt_extended_48x48.png
diff --git a/examples/widgets/widgets/mousebuttons/buttontester.cpp b/examples/widgets/widgets/mousebuttons/buttontester.cpp
index 41c6c95adf..51287f541b 100644
--- a/examples/widgets/widgets/mousebuttons/buttontester.cpp
+++ b/examples/widgets/widgets/mousebuttons/buttontester.cpp
@@ -41,6 +41,8 @@
 
 #include "buttontester.h"
 
+#include <QDebug>
+
 void ButtonTester::mousePressEvent(QMouseEvent *e)
 {
     int j = ButtonTester::buttonByNumber (e->button());
diff --git a/examples/widgets/widgets/mousebuttons/buttontester.h b/examples/widgets/widgets/mousebuttons/buttontester.h
index 9e7011ac9a..41ae8d0582 100644
--- a/examples/widgets/widgets/mousebuttons/buttontester.h
+++ b/examples/widgets/widgets/mousebuttons/buttontester.h
@@ -41,10 +41,8 @@
 #ifndef BUTTONTESTER_H
 #define BUTTONTESTER_H
 
-#include <QtWidgets>
 #include <QTextEdit>
 #include <QString>
-#include <QDebug>
 #include <QMouseEvent>
 #include <QWheelEvent>
 
diff --git a/examples/widgets/widgets/mousebuttons/main.cpp b/examples/widgets/widgets/mousebuttons/main.cpp
index 184547113e..b5446df9e9 100644
--- a/examples/widgets/widgets/mousebuttons/main.cpp
+++ b/examples/widgets/widgets/mousebuttons/main.cpp
@@ -40,7 +40,10 @@
 ****************************************************************************/
 
 #include "buttontester.h"
-#include <QtGui>
+
+#include <QApplication>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 int main(int argv, char **args)
 {