aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickframebufferobject
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-04-03 14:05:24 +0200
committerLiang Qi <liang.qi@qt.io>2018-04-03 15:34:24 +0000
commitfd8c3e41fc90bb431159343926dff628a860f289 (patch)
treec1cddb3444759363c1fd9c9d2963db6cd840c867 /tests/auto/quick/qquickframebufferobject
parent198409ba76e18587526e9e1ec84fdb432c671937 (diff)
test: fix tst_QQuickFramebufferObject
Call qWaitForWindowExposed() instead of qWaitForWindowActive(). This is because ed4833465b53dbd691298f8d303df51a8908edba in qtbase. Task-number: QTBUG-67371 Change-Id: I969f57dbc1ca4e6c2c935a9a68d2274f648e262f Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickframebufferobject')
-rw-r--r--tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp b/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp
index 805baebc7a..6aff66d61e 100644
--- a/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp
+++ b/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp
@@ -193,7 +193,7 @@ void tst_QQuickFramebufferObject::testThatStuffWorks()
view.show();
view.requestActivate();
- QVERIFY(QTest::qWaitForWindowActive(&view));
+ QVERIFY(QTest::qWaitForWindowExposed(&view));
QImage result = view.grabWindow();
@@ -233,7 +233,7 @@ void tst_QQuickFramebufferObject::testInvalidate()
view.show();
view.requestActivate();
- QVERIFY(QTest::qWaitForWindowActive(&view));
+ QVERIFY(QTest::qWaitForWindowExposed(&view));
QCOMPARE(frameInfo.fboSize, QSize(200, 200));