summaryrefslogtreecommitdiffstats
path: root/tests/manual/cocoa/qt_on_cocoa/rasterwindow.h
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-08-30 19:05:39 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-08-31 23:09:24 +0000
commit28414f8e3a25f6ac913d14542866a7d1745b4df1 (patch)
treebe7967112da3453bc238672597eaca2304b50980 /tests/manual/cocoa/qt_on_cocoa/rasterwindow.h
parentfefbed5eae9e1b2761da6a506874b0ccd42fd6a0 (diff)
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>
Diffstat (limited to 'tests/manual/cocoa/qt_on_cocoa/rasterwindow.h')
-rw-r--r--tests/manual/cocoa/qt_on_cocoa/rasterwindow.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/manual/cocoa/qt_on_cocoa/rasterwindow.h b/tests/manual/cocoa/qt_on_cocoa/rasterwindow.h
index eff2addb70..5262300b12 100644
--- a/tests/manual/cocoa/qt_on_cocoa/rasterwindow.h
+++ b/tests/manual/cocoa/qt_on_cocoa/rasterwindow.h
@@ -44,7 +44,7 @@ protected:
void exposeEvent(QExposeEvent *);
void resizeEvent(QResizeEvent *);
- void timerEvent(QTimerEvent *);
+ bool event(QEvent *);
private:
void render();
@@ -56,5 +56,4 @@ private:
QPoint m_lastPos;
int m_backgroundColorIndex;
QBackingStore *m_backingStore;
- int m_renderTimer;
};