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

diff --git a/src/plugins/platforms/cocoa/qnswindowdelegate.mm b/src/plugins/platforms/cocoa/qnswindowdelegate.mm
index 14f1ca0114..087cb3651f 100644
--- a/src/plugins/platforms/cocoa/qnswindowdelegate.mm
+++ b/src/plugins/platforms/cocoa/qnswindowdelegate.mm
@@ -102,40 +102,6 @@ static QCocoaWindow *toPlatformWindow(NSWindow *window)
     return QCocoaScreen::mapToNative(maximizedFrame);
 }
 
-#pragma clang diagnostic push
-// NSDisableScreenUpdates and NSEnableScreenUpdates are deprecated, but the
-// NSAnimationContext API that replaces them doesn't handle the use-case of
-// cross-thread screen update synchronization.
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-- (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)frameSize
-{
-    Q_ASSERT(toPlatformWindow(window));
-
-    qCDebug(lcQpaWindow) << window << "will resize to" << QSizeF::fromCGSize(frameSize)
-        << "- disabling screen updates temporarily";
-
-    // There may be separate threads rendering to CA layers in this window,
-    // and if any of them do a swap while the resize is still in progress,
-    // the visual bounds of that layer will be updated before the visual
-    // bounds of the window frame, resulting in flickering while resizing.
-
-    // To prevent this we disable screen updates for the whole process until
-    // the resize is complete, which makes the whole thing visually atomic.
-    NSDisableScreenUpdates();
-
-    return frameSize;
-}
-
-- (void)windowDidResize:(NSNotification *)notification
-{
-    NSWindow *window = notification.object;
-    Q_ASSERT(toPlatformWindow(window));
-
-    qCDebug(lcQpaWindow) << window << "was resized - re-enabling screen updates";
-    NSEnableScreenUpdates();
-}
-#pragma clang diagnostic pop
-
 - (BOOL)window:(NSWindow *)window shouldPopUpDocumentPathMenu:(NSMenu *)menu
 {
     Q_UNUSED(menu);