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

5 files changed, 57 insertions, 51 deletions

diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
index 01e3d7bac0..d8239b5a28 100644
--- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
@@ -43,6 +43,10 @@
 
 #include <qformlayout.h>
 
+// ItemRole has enumerators for numerical values 0..2, thus the only
+// valid numerical values for storing into an ItemRole variable are 0..3:
+Q_CONSTEXPR QFormLayout::ItemRole invalidRole = QFormLayout::ItemRole(3);
+
 static inline void setFrameless(QWidget *w)
 {
     Qt::WindowFlags flags = w->windowFlags();
@@ -567,7 +571,7 @@ void tst_QFormLayout::insertRow_QWidget_QWidget()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout->getWidgetPosition(lbl1, &row, &role);
         QCOMPARE(row, 0);
         QCOMPARE(int(role), int(QFormLayout::LabelRole));
@@ -575,7 +579,7 @@ void tst_QFormLayout::insertRow_QWidget_QWidget()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout->getWidgetPosition(fld1, &row, &role);
         QCOMPARE(row, 0);
         QCOMPARE(int(role), int(QFormLayout::FieldRole));
@@ -636,7 +640,7 @@ void tst_QFormLayout::insertRow_QWidget_QLayout()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout->getWidgetPosition(lbl1, &row, &role);
         QCOMPARE(row, 0);
         QCOMPARE(int(role), int(QFormLayout::LabelRole));
@@ -644,7 +648,7 @@ void tst_QFormLayout::insertRow_QWidget_QLayout()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout->getLayoutPosition(fld1, &row, &role);
         QCOMPARE(row, 0);
         QCOMPARE(int(role), int(QFormLayout::FieldRole));
@@ -992,7 +996,7 @@ void tst_QFormLayout::setWidget()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getWidgetPosition(&w1, &row, &role);
         QCOMPARE(row, 5);
         QCOMPARE(int(role), int(QFormLayout::LabelRole));
@@ -1000,7 +1004,7 @@ void tst_QFormLayout::setWidget()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getWidgetPosition(&w2, &row, &role);
         QCOMPARE(row, 3);
         QCOMPARE(int(role), int(QFormLayout::FieldRole));
@@ -1008,7 +1012,7 @@ void tst_QFormLayout::setWidget()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getWidgetPosition(&w3, &row, &role);
         QCOMPARE(row, 3);
         QCOMPARE(int(role), int(QFormLayout::LabelRole));
@@ -1016,18 +1020,20 @@ void tst_QFormLayout::setWidget()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getWidgetPosition(&w4, &row, &role);
+        // not found
         QCOMPARE(row, -1);
-        QCOMPARE(int(role), -123);
+        QCOMPARE(int(role), int(invalidRole));
     }
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getWidgetPosition(0, &row, &role);
+        // not found
         QCOMPARE(row, -1);
-        QCOMPARE(int(role), -123);
+        QCOMPARE(int(role), int(invalidRole));
     }
 }
 
@@ -1060,7 +1066,7 @@ void tst_QFormLayout::setLayout()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getLayoutPosition(&l1, &row, &role);
         QCOMPARE(row, 5);
         QCOMPARE(int(role), int(QFormLayout::LabelRole));
@@ -1068,7 +1074,7 @@ void tst_QFormLayout::setLayout()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getLayoutPosition(&l2, &row, &role);
         QCOMPARE(row, 3);
         QCOMPARE(int(role), int(QFormLayout::FieldRole));
@@ -1076,7 +1082,7 @@ void tst_QFormLayout::setLayout()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getLayoutPosition(&l3, &row, &role);
         QCOMPARE(row, 3);
         QCOMPARE(int(role), int(QFormLayout::LabelRole));
@@ -1084,18 +1090,18 @@ void tst_QFormLayout::setLayout()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getLayoutPosition(&l4, &row, &role);
         QCOMPARE(row, -1);
-        QCOMPARE(int(role), -123);
+        QCOMPARE(int(role), int(invalidRole));
     }
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getLayoutPosition(0, &row, &role);
         QCOMPARE(row, -1);
-        QCOMPARE(int(role), -123);
+        QCOMPARE(int(role), int(invalidRole));
     }
 }
 
diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
index 47fc002196..829d0ea098 100644
--- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
+++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
@@ -297,7 +297,7 @@ void tst_QLayout::warnIfWrongParent()
     QHBoxLayout lay;
     lay.setParent(&root);
     QTest::ignoreMessage(QtWarningMsg, "QLayout::parentWidget: A layout can only have another layout as a parent.");
-    QCOMPARE(lay.parentWidget(), static_cast<QWidget*>(0));
+    QCOMPARE(lay.parentWidget(), nullptr);
 }
 
 void tst_QLayout::controlTypes()
diff --git a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
index badeca69bb..835b6ca799 100644
--- a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
+++ b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
@@ -122,7 +122,7 @@ void tst_QStackedLayout::testCase()
 
     // Nothing in layout
     QCOMPARE(testLayout->currentIndex(), -1);
-    QCOMPARE(testLayout->currentWidget(), static_cast<QWidget*>(0));
+    QCOMPARE(testLayout->currentWidget(), nullptr);
     QCOMPARE(testLayout->count(), 0);
 
     // One widget added to layout
@@ -163,7 +163,7 @@ void tst_QStackedLayout::testCase()
     QCOMPARE(spy.at(0).at(0).toInt(), -1);
     spy.clear();
     QCOMPARE(testLayout->currentIndex(), -1);
-    QCOMPARE(testLayout->currentWidget(), static_cast<QWidget*>(0));
+    QCOMPARE(testLayout->currentWidget(), nullptr);
     QCOMPARE(testLayout->count(), 0);
 
     // Another widget inserted at current index.
@@ -217,7 +217,7 @@ void tst_QStackedLayout::testCase()
     QVERIFY(w3->isVisible());
     testLayout->removeWidget(w3);
     QCOMPARE(testLayout->currentIndex(), -1);
-    QCOMPARE(testLayout->currentWidget(), static_cast<QWidget*>(0));
+    QCOMPARE(testLayout->currentWidget(), nullptr);
 }
 
 void tst_QStackedLayout::deleteCurrent()
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 28849e345b..54f1a1bf1e 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -2188,8 +2188,8 @@ void tst_QWidget::showMinimizedKeepsFocus()
         QTRY_COMPARE(qApp->focusWidget(), child);
 
         delete child;
-        QCOMPARE(window.focusWidget(), static_cast<QWidget*>(0));
-        QCOMPARE(qApp->focusWidget(), static_cast<QWidget*>(0));
+        QCOMPARE(window.focusWidget(), nullptr);
+        QCOMPARE(QApplication::focusWidget(), nullptr);
     }
 
     //testing reparenting the focus widget
@@ -2207,8 +2207,8 @@ void tst_QWidget::showMinimizedKeepsFocus()
 
         child->setParent(0);
         QScopedPointer<QWidget> childGuard(child);
-        QCOMPARE(window.focusWidget(), static_cast<QWidget*>(0));
-        QCOMPARE(qApp->focusWidget(), static_cast<QWidget*>(0));
+        QCOMPARE(window.focusWidget(), nullptr);
+        QCOMPARE(QApplication::focusWidget(), nullptr);
     }
 
     //testing setEnabled(false)
@@ -2225,8 +2225,8 @@ void tst_QWidget::showMinimizedKeepsFocus()
         QTRY_COMPARE(qApp->focusWidget(), child);
 
         child->setEnabled(false);
-        QCOMPARE(window.focusWidget(), static_cast<QWidget*>(0));
-        QCOMPARE(qApp->focusWidget(), static_cast<QWidget*>(0));
+        QCOMPARE(window.focusWidget(), nullptr);
+        QCOMPARE(QApplication::focusWidget(), nullptr);
     }
 
     //testing clearFocus
@@ -2245,14 +2245,14 @@ void tst_QWidget::showMinimizedKeepsFocus()
         QTRY_COMPARE(qApp->focusWidget(), child);
 
         child->clearFocus();
-        QCOMPARE(window.focusWidget(), static_cast<QWidget*>(0));
-        QCOMPARE(qApp->focusWidget(), static_cast<QWidget*>(0));
+        QCOMPARE(window.focusWidget(), nullptr);
+        QCOMPARE(QApplication::focusWidget(), nullptr);
 
         window.showMinimized();
         QTest::qWait(30);
         QTRY_VERIFY(window.isMinimized());
-        QCOMPARE(window.focusWidget(), static_cast<QWidget*>(0));
-        QTRY_COMPARE(qApp->focusWidget(), static_cast<QWidget*>(0));
+        QCOMPARE(window.focusWidget(), nullptr);
+        QTRY_COMPARE(QApplication::focusWidget(), nullptr);
 
         window.showNormal();
         qApp->setActiveWindow(&window);
@@ -5260,12 +5260,12 @@ void tst_QWidget::setFocus()
         child1.setFocus();
         QVERIFY(!child1.hasFocus());
         QCOMPARE(window.focusWidget(), &child1);
-        QCOMPARE(QApplication::focusWidget(), static_cast<QWidget *>(0));
+        QCOMPARE(QApplication::focusWidget(), nullptr);
 
         child2.setFocus();
         QVERIFY(!child2.hasFocus());
         QCOMPARE(window.focusWidget(), &child2);
-        QCOMPARE(QApplication::focusWidget(), static_cast<QWidget *>(0));
+        QCOMPARE(QApplication::focusWidget(), nullptr);
     }
 
     {
@@ -5294,12 +5294,12 @@ void tst_QWidget::setFocus()
         child1.setFocus();
         QVERIFY(!child1.hasFocus());
         QCOMPARE(window.focusWidget(), &child1);
-        QCOMPARE(QApplication::focusWidget(), static_cast<QWidget *>(0));
+        QCOMPARE(QApplication::focusWidget(), nullptr);
 
         child2.setFocus();
         QVERIFY(!child2.hasFocus());
         QCOMPARE(window.focusWidget(), &child2);
-        QCOMPARE(QApplication::focusWidget(), static_cast<QWidget *>(0));
+        QCOMPARE(QApplication::focusWidget(), nullptr);
     }
 
     {
@@ -5355,8 +5355,8 @@ void tst_QWidget::setFocus()
 
         child1.setFocus();
         QVERIFY(!child1.hasFocus());
-        QCOMPARE(window.focusWidget(), static_cast<QWidget *>(0));
-        QCOMPARE(QApplication::focusWidget(), static_cast<QWidget *>(0));
+        QCOMPARE(window.focusWidget(), nullptr);
+        QCOMPARE(QApplication::focusWidget(), nullptr);
 
         child1.show();
         QApplication::processEvents();
@@ -5396,33 +5396,33 @@ void tst_QWidget::setFocus()
 
         child1.setFocus();
         QVERIFY(!child1.hasFocus());
-        QCOMPARE(window.focusWidget(), static_cast<QWidget *>(0));
-        QCOMPARE(QApplication::focusWidget(), static_cast<QWidget *>(0));
+        QCOMPARE(window.focusWidget(), nullptr);
+        QCOMPARE(QApplication::focusWidget(), nullptr);
 
         child1.hide();
         QVERIFY(!child1.hasFocus());
-        QCOMPARE(window.focusWidget(), static_cast<QWidget *>(0));
-        QCOMPARE(QApplication::focusWidget(), static_cast<QWidget *>(0));
+        QCOMPARE(window.focusWidget(), nullptr);
+        QCOMPARE(QApplication::focusWidget(), nullptr);
 
         child1.show();
         QVERIFY(!child1.hasFocus());
-        QCOMPARE(window.focusWidget(), static_cast<QWidget *>(0));
-        QCOMPARE(QApplication::focusWidget(), static_cast<QWidget *>(0));
+        QCOMPARE(window.focusWidget(), nullptr);
+        QCOMPARE(QApplication::focusWidget(), nullptr);
 
         child2.setFocus();
         QVERIFY(!child2.hasFocus());
-        QCOMPARE(window.focusWidget(), static_cast<QWidget *>(0));
-        QCOMPARE(QApplication::focusWidget(), static_cast<QWidget *>(0));
+        QCOMPARE(window.focusWidget(), nullptr);
+        QCOMPARE(QApplication::focusWidget(), nullptr);
 
         child2.hide();
         QVERIFY(!child2.hasFocus());
-        QCOMPARE(window.focusWidget(), static_cast<QWidget *>(0));
-        QCOMPARE(QApplication::focusWidget(), static_cast<QWidget *>(0));
+        QCOMPARE(window.focusWidget(), nullptr);
+        QCOMPARE(QApplication::focusWidget(), nullptr);
 
         child2.show();
         QVERIFY(!child2.hasFocus());
-        QCOMPARE(window.focusWidget(), static_cast<QWidget *>(0));
-        QCOMPARE(QApplication::focusWidget(), static_cast<QWidget *>(0));
+        QCOMPARE(window.focusWidget(), nullptr);
+        QCOMPARE(QApplication::focusWidget(), nullptr);
     }
 }
 
diff --git a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
index 406b21ccf6..5e3868ea8f 100644
--- a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
+++ b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
@@ -161,7 +161,7 @@ void tst_QWindowContainer::testOwnership()
 
     delete container;
 
-    QCOMPARE(window.data(), (QWindow *) 0);
+    QCOMPARE(window.data(), nullptr);
 }