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, 7 insertions, 7 deletions

diff --git a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
index 99d067b7d7..f5cf9d7750 100644
--- a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
+++ b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
@@ -215,7 +215,7 @@ void tst_QUndoGroup::setActive()
     QUndoGroup group;
     QUndoStack stack1(&group), stack2(&group);
 
-    QCOMPARE(group.activeStack(), (QUndoStack*)0);
+    QCOMPARE(group.activeStack(), nullptr);
     QCOMPARE(stack1.isActive(), false);
     QCOMPARE(stack2.isActive(), false);
 
@@ -238,13 +238,13 @@ void tst_QUndoGroup::setActive()
     QCOMPARE(stack3.isActive(), false);
 
     group.removeStack(&stack2);
-    QCOMPARE(group.activeStack(), (QUndoStack*)0);
+    QCOMPARE(group.activeStack(), nullptr);
     QCOMPARE(stack1.isActive(), false);
     QCOMPARE(stack2.isActive(), true);
     QCOMPARE(stack3.isActive(), false);
 
     group.removeStack(&stack2);
-    QCOMPARE(group.activeStack(), (QUndoStack*)0);
+    QCOMPARE(group.activeStack(), nullptr);
     QCOMPARE(stack1.isActive(), false);
     QCOMPARE(stack2.isActive(), true);
     QCOMPARE(stack3.isActive(), false);
@@ -280,7 +280,7 @@ void tst_QUndoGroup::deleteStack()
 
     QUndoStack *stack1 = new QUndoStack(&group);
     QCOMPARE(group.stacks(), QList<QUndoStack*>() << stack1);
-    QCOMPARE(group.activeStack(), (QUndoStack*)0);
+    QCOMPARE(group.activeStack(), nullptr);
 
     stack1->setActive();
     QCOMPARE(group.activeStack(), stack1);
@@ -299,17 +299,17 @@ void tst_QUndoGroup::deleteStack()
 
     delete stack1;
     QCOMPARE(group.stacks(), QList<QUndoStack*>() << stack3);
-    QCOMPARE(group.activeStack(), (QUndoStack*)0);
+    QCOMPARE(group.activeStack(), nullptr);
 
     stack3->setActive(false);
-    QCOMPARE(group.activeStack(), (QUndoStack*)0);
+    QCOMPARE(group.activeStack(), nullptr);
 
     stack3->setActive(true);
     QCOMPARE(group.activeStack(), stack3);
 
     group.removeStack(stack3);
     QCOMPARE(group.stacks(), QList<QUndoStack*>());
-    QCOMPARE(group.activeStack(), (QUndoStack*)0);
+    QCOMPARE(group.activeStack(), nullptr);
 
     delete stack3;
 }