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

 Conflicts:
	tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp

Added tests/auto/testlib/selftests/expected_crashes_5.txt to work
round the output of the crashes test (which exercises UB, see
QTBUG-73903) being truncated on one test platform.

Change-Id: I9cd3f2639b4e50c3c4513e14629a40bdca8f8273

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dnativeinterface.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dnativeinterface.cpp
index f763c4f7ab..220302d041 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dnativeinterface.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dnativeinterface.cpp
@@ -47,15 +47,15 @@ void *QWindowsDirect2DNativeInterface::nativeResourceForBackingStore(const QByte
 {
     if (!bs || !bs->handle()) {
         qWarning("%s: '%s' requested for null backingstore or backingstore without handle.", __FUNCTION__, resource.constData());
-        return 0;
+        return nullptr;
     }
 
     // getDC is so common we don't want to print an "invalid key" line for it
     if (resource == "getDC")
-        return 0;
+        return nullptr;
 
     qWarning("%s: Invalid key '%s' requested.", __FUNCTION__, resource.constData());
-    return 0;
+    return nullptr;
 
 }