macOS: Update qt_on_cocoa manual test

- Add view to contentView, to allow checking parent view interaction
- Render via requestUpdate instead of manual timer
- Add two windows to check subview interaction

Change-Id: Ib028e62f585d45e42c0429e69ea6f45c8a90fe54
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

1 files changed, 7 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..8a451d5f7c 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,7 +59,6 @@ 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)
@@ -104,7 +92,7 @@ void RasterWindow::mouseReleaseEvent(QMouseEvent *event)
 
 void RasterWindow::exposeEvent(QExposeEvent *)
 {
-    scheduleRender();
+    render();
 }
 
 void RasterWindow::resizeEvent(QResizeEvent *)
@@ -146,15 +134,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()