Merge remote-tracking branch 'origin/release' into stable

Change-Id: I894ad7b4888744833f487b481950c087fa960a5c

1 files changed, 0 insertions, 16 deletions

diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index bfd24e727a..2759d82e77 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -817,7 +817,6 @@ void QSGThreadedRenderLoop::show(QQuickWindow *window)
     win.thread = new QSGRenderThread(this, QQuickWindowPrivate::get(window)->context);
     win.timerId = 0;
     win.updateDuringSync = false;
-    win.gotBrokenExposeFromPlatformPlugin = false;
     m_windows << win;
 }
 
@@ -883,19 +882,6 @@ void QSGThreadedRenderLoop::exposureChanged(QQuickWindow *window)
     }
 }
 
-void QSGThreadedRenderLoop::resize(QQuickWindow *window)
-{
-    Window *w = windowFor(m_windows, window);
-    if (w
-        && w->gotBrokenExposeFromPlatformPlugin
-        && window->width() > 0 && window->height() > 0
-        && w->window->geometry().intersects(w->window->screen()->availableGeometry())) {
-        w->gotBrokenExposeFromPlatformPlugin = false;
-        handleExposure(w);
-    }
-}
-
-
 /*!
     Will post an event to the render thread that this window should
     start to render.
@@ -909,8 +895,6 @@ void QSGThreadedRenderLoop::handleExposure(Window *w)
 #ifndef QT_NO_DEBUG
         qWarning("QSGThreadedRenderLoop: expose event received for window with invalid geometry.");
 #endif
-        w->gotBrokenExposeFromPlatformPlugin = true;
-        return;
     }
 
     // Because we are going to bind a GL context to it, make sure it