summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2016-01-13 15:30:15 +0100
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2016-01-13 15:06:18 +0000
commit3c6eb1d5a1344bd60e9fc812b999695957d7028a (patch)
tree909f189e234e71552a2766ab838355c889ae5b10 /tests
parent811e583807d7f1f6654aca926f2c6830b88f21af (diff)
Fix tst_QQuickWebEngineViewGraphics::showHideShow for OS X
Defer the TestView::exposeChanged signal. On OS X exposeEvent is called directly by view->show(). Thus exposeChanged was emitted before signalSpy.wait() was called and the check on wait consequently failed. Change-Id: Ie318f8ddc0d1bcc35a14c73e615798b3e164739c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
index a969993ff..eacd1f87e 100644
--- a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
+++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
@@ -52,12 +52,19 @@
class TestView : public QQuickView {
Q_OBJECT
public:
+ TestView()
+ {
+ connect(this, &TestView::_q_exposeChanged, this, &TestView::exposeChanged,
+ Qt::QueuedConnection);
+ }
+
virtual void exposeEvent(QExposeEvent *e) Q_DECL_OVERRIDE {
QQuickView::exposeEvent(e);
- emit exposeChanged();
+ emit _q_exposeChanged();
}
Q_SIGNALS:
+ void _q_exposeChanged();
void exposeChanged();
};