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

Conflicts:
	src/gui/kernel/qguiapplication.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/testlib/qtestsystem.h

Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5

1 files changed, 8 insertions, 19 deletions

diff --git a/tests/manual/cocoa/qt_on_cocoa/rasterwindow.cpp b/tests/manual/cocoa/qt_on_cocoa/rasterwindow.cpp
index ca09af9964..dca39839dd 100644
--- a/tests/manual/cocoa/qt_on_cocoa/rasterwindow.cpp
+++ b/tests/manual/cocoa/qt_on_cocoa/rasterwindow.cpp
@@ -52,17 +52,6 @@ RasterWindow::RasterWindow(QRasterWindow *parent)
 
 void RasterWindow::initialize()
 {
-    if (parent())
-        setGeometry(QRect(160, 120, 320, 240));
-    else {
-        setGeometry(QRect(10, 10, 640, 480));
-
-        setSizeIncrement(QSize(10, 10));
-        setBaseSize(QSize(640, 480));
-        setMinimumSize(QSize(240, 160));
-        setMaximumSize(QSize(800, 600));
-    }
-
     create();
     m_backingStore = new QBackingStore(this);
 
@@ -70,12 +59,12 @@ void RasterWindow::initialize()
     m_image.fill(colorTable[m_backgroundColorIndex % (sizeof(colorTable) / sizeof(colorTable[0]))].rgba());
 
     m_lastPos = QPoint(-1, -1);
-    m_renderTimer = 0;
 }
 
 void RasterWindow::mousePressEvent(QMouseEvent *event)
 {
     m_lastPos = event->pos();
+    unsetCursor();
 }
 
 void RasterWindow::mouseMoveEvent(QMouseEvent *event)
@@ -104,7 +93,7 @@ void RasterWindow::mouseReleaseEvent(QMouseEvent *event)
 
 void RasterWindow::exposeEvent(QExposeEvent *)
 {
-    scheduleRender();
+    render();
 }
 
 void RasterWindow::resizeEvent(QResizeEvent *)
@@ -146,15 +135,15 @@ void RasterWindow::keyPressEvent(QKeyEvent *event)
 
 void RasterWindow::scheduleRender()
 {
-    if (!m_renderTimer)
-        m_renderTimer = startTimer(1);
+    requestUpdate();
 }
 
-void RasterWindow::timerEvent(QTimerEvent *)
+bool RasterWindow::event(QEvent *e)
 {
-    render();
-    killTimer(m_renderTimer);
-    m_renderTimer = 0;
+    if (e->type() == QEvent::UpdateRequest)
+        render();
+
+    return QWindow::event(e);
 }
 
 void RasterWindow::render()