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

Conflicts:
	configure
	qmake/Makefile.unix.macos
	qmake/Makefile.unix.win32
	qmake/generators/win32/msvc_vcproj.cpp
	src/3rdparty/pcre/qt_attribution.json
	src/corelib/io/qsettings.cpp
	src/corelib/kernel/qdeadlinetimer.cpp
	src/platformsupport/kmsconvenience/qkmsdevice.cpp
	src/platformsupport/kmsconvenience/qkmsdevice_p.h
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
	tests/manual/qstorageinfo/printvolumes.cpp
	tools/configure/configureapp.cpp

Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e

1 files changed, 17 insertions, 17 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index 9e390e45a6..1be17b552e 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -287,14 +287,14 @@ void tst_QGraphicsWidget::qgraphicswidget()
 
     QVERIFY(!widget.isWindow());
     QCOMPARE(widget.boundingRect(), QRectF(0, 0, 0, 0));
-    QCOMPARE(widget.focusWidget(), (QGraphicsWidget*)0);
+    QCOMPARE(widget.focusWidget(), nullptr);
     QCOMPARE(widget.focusPolicy(), Qt::NoFocus);
     QCOMPARE(widget.font(), QFont());
     QCOMPARE(widget.geometry(), QRectF(widget.pos(), widget.size()));
-    QCOMPARE(widget.layout(), (QGraphicsLayout*)0);
+    QCOMPARE(widget.layout(), nullptr);
     QCOMPARE(widget.layoutDirection(), Qt::LeftToRight);
     QCOMPARE(widget.palette(), QPalette());
-    QCOMPARE(widget.parentWidget(), (QGraphicsWidget*)0);
+    QCOMPARE(widget.parentWidget(), nullptr);
     QCOMPARE(widget.rect(), QRectF(QPointF(), widget.size()));
     QCOMPARE(widget.size(), QSizeF(0, 0));
     QVERIFY(widget.style() != (QStyle*)0);
@@ -415,7 +415,7 @@ void tst_QGraphicsWidget::focusWidget_data()
 void tst_QGraphicsWidget::focusWidget()
 {
     SubQGraphicsWidget *parent = new SubQGraphicsWidget;
-    QCOMPARE(parent->focusWidget(), (QGraphicsWidget *)0);
+    QCOMPARE(parent->focusWidget(), nullptr);
     QGraphicsScene scene;
     QEvent windowActivate(QEvent::WindowActivate);
     qApp->sendEvent(&scene, &windowActivate);
@@ -1131,7 +1131,7 @@ void tst_QGraphicsWidget::layout()
 {
     SubQGraphicsWidget widget;
     widget.setContentsMargins(10, 5, 50, 100);
-    QCOMPARE(widget.layout(), (QGraphicsLayout *)0);
+    QCOMPARE(widget.layout(), nullptr);
     QFETCH(int, childCount);
 
     QGraphicsLinearLayout *layout = new QGraphicsLinearLayout;
@@ -1292,9 +1292,9 @@ void tst_QGraphicsWidget::parentWidget()
     SubQGraphicsWidget widgetChild(&standAlongWidget);
     SubQGraphicsWidget itemChild(&standAlongItem);
 
-    QCOMPARE(standAlongWidget.parentWidget(), (QGraphicsWidget*)0);
+    QCOMPARE(standAlongWidget.parentWidget(), nullptr);
     QCOMPARE(widgetChild.parentWidget(), static_cast<QGraphicsWidget*>(&standAlongWidget));
-    QCOMPARE(itemChild.parentWidget(), (QGraphicsWidget*)0);
+    QCOMPARE(itemChild.parentWidget(), nullptr);
 
     for (int i = 0; i < childrenCount; ++i) {
         SubQGraphicsWidget *item = new SubQGraphicsWidget(&standAlongWidget);
@@ -1497,7 +1497,7 @@ void tst_QGraphicsWidget::setTabOrderAndReparent()
     w[2]->setFocus();
     QVERIFY2(compareFocusChain(&view, w + 2, w + 3, &errorMessage), errorMessage.constData());
     w[2]->setParentItem(p);
-    QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem*>(0));
+    QCOMPARE(scene.focusItem(), nullptr);
 
     scene.addItem(p);
     p->setFocus();
@@ -2117,7 +2117,7 @@ void tst_QGraphicsWidget::explicitMouseGrabber()
     QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget);
     QCOMPARE(widgetGrabEventSpy.count(), 1);
     widget->ungrabMouse();
-    QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0);
+    QCOMPARE(scene.mouseGrabberItem(), nullptr);
     QCOMPARE(widgetUngrabEventSpy.count(), 1);
 
     // Grab while grabbing
@@ -2165,7 +2165,7 @@ void tst_QGraphicsWidget::explicitMouseGrabber()
     QCOMPARE(widgetGrabEventSpy.count(), 4);
     QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget);
     widget->ungrabMouse();
-    QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0);
+    QCOMPARE(scene.mouseGrabberItem(), nullptr);
 
     // Out of order ungrab
     widget->grabMouse();
@@ -2210,7 +2210,7 @@ void tst_QGraphicsWidget::implicitMouseGrabber()
         event.setScenePos(QPointF(50, 50));
         qApp->sendEvent(&scene, &event);
     }
-    QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0);
+    QCOMPARE(scene.mouseGrabberItem(), nullptr);
     QCOMPARE(widgetGrabEventSpy.count(), 1);
     QCOMPARE(widgetUngrabEventSpy.count(), 1);
 
@@ -2238,7 +2238,7 @@ void tst_QGraphicsWidget::implicitMouseGrabber()
     QCOMPARE(widgetUngrabEventSpy.count(), 1);
     widget->ungrabMouse();
     QCOMPARE(widgetUngrabEventSpy.count(), 2);
-    QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0);
+    QCOMPARE(scene.mouseGrabberItem(), nullptr);
 
     // Implicit mouse grabber tries to explicitly grab the mouse
     {
@@ -2263,7 +2263,7 @@ void tst_QGraphicsWidget::implicitMouseGrabber()
     QCOMPARE(widgetGrabEventSpy.count(), 3);
     QCOMPARE(widgetUngrabEventSpy.count(), 2);
     widget->ungrabMouse();
-    QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0);
+    QCOMPARE(scene.mouseGrabberItem(), nullptr);
     QCOMPARE(widgetGrabEventSpy.count(), 3);
     QCOMPARE(widgetUngrabEventSpy.count(), 3);
 
@@ -2293,7 +2293,7 @@ void tst_QGraphicsWidget::implicitMouseGrabber()
 
     scene.removeItem(widget);
     QCOMPARE(widgetUngrabEventSpy.count(), 4);
-    QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0);
+    QCOMPARE(scene.mouseGrabberItem(), nullptr);
 }
 
 class GrabOnPressItem : public QGraphicsRectItem
@@ -2367,7 +2367,7 @@ void tst_QGraphicsWidget::doubleClickAfterExplicitMouseGrab()
         event.setScenePos(QPointF(50, 50));
         qApp->sendEvent(&scene, &event);
     }
-    QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0);
+    QCOMPARE(scene.mouseGrabberItem(), nullptr);
     QCOMPARE(item->nrelease, 1);
     QCOMPARE(item->nungrab, 1);
     {
@@ -2389,7 +2389,7 @@ void tst_QGraphicsWidget::doubleClickAfterExplicitMouseGrab()
         event.setScenePos(QPointF(50, 50));
         qApp->sendEvent(&scene, &event);
     }
-    QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0);
+    QCOMPARE(scene.mouseGrabberItem(), nullptr);
     QCOMPARE(item->nrelease, 2);
     QCOMPARE(item->nungrab, 2);
 }
@@ -2411,7 +2411,7 @@ void tst_QGraphicsWidget::popupMouseGrabber()
     // Hiding it loses the grab again.
     widget->hide();
     QCOMPARE(widgetUngrabEventSpy.count(), 1);
-    QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0);
+    QCOMPARE(scene.mouseGrabberItem(), nullptr);
 
     // Showing it grabs the mouse again
     widget->show();