qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make tst_qquickframebufferobject pass on macOS 

The test has not been run in the CI, so the problem went unnoticed for
a long time.

Change-Id: I42a44a5fb89c0bd78e8997d4841e85672c73acdb
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
J-P Nurmi 2017-11-08 10:58:46 +01:00
parent e08c42e9fd
commit 8cf186cc7c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp
View File

@ -192,7 +192,8 @@ void tst_QQuickFramebufferObject::testThatStuffWorks()
item->setMsaa(msaa); item->setMsaa(msaa);
view.show(); view.show();
QTest::qWaitForWindowExposed(&view); view.requestActivate();
QTest::qWaitForWindowActive(&view);
QImage result = view.grabWindow(); QImage result = view.grabWindow();
@ -231,7 +232,8 @@ void tst_QQuickFramebufferObject::testInvalidate()
item->setTextureSize(QSize(200, 200)); item->setTextureSize(QSize(200, 200));
view.show(); view.show();
QTest::qWaitForWindowExposed(&view); view.requestActivate();
QTest::qWaitForWindowActive(&view);
QCOMPARE(frameInfo.fboSize, QSize(200, 200)); QCOMPARE(frameInfo.fboSize, QSize(200, 200));