summaryrefslogtreecommitdiffstats
path: root/tests/auto/opengl/qgl
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-07-17 15:24:02 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-07-17 14:11:06 +0000
commit64bce9bbff44d337ba6f25f8d0571810b668825d (patch)
treea5f067cc1286912777375fcad05d2dc74c04c1ea /tests/auto/opengl/qgl
parentb2cb4c73d325e547eed9200394bd0f833ae25cd4 (diff)
tst_QGL::graphicsViewClipping: Wait for viewport's window handle
The QWidget overload of qWaitForWindowExposed waits for the widget's top level QWindow, which for the viewport is the graphics-view. We want to explicitly wait for the viewport to be exposed, as the viewport is covering the whole graphics-view, preventing it from being exposed. See a6991376c. Change-Id: I86df43871126562f09e4ce14931bc6fc7f06263d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/opengl/qgl')
-rw-r--r--tests/auto/opengl/qgl/tst_qgl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp
index cc4e15c407..f110b9cb0d 100644
--- a/tests/auto/opengl/qgl/tst_qgl.cpp
+++ b/tests/auto/opengl/qgl/tst_qgl.cpp
@@ -868,7 +868,7 @@ void tst_QGL::graphicsViewClipping()
scene.setSceneRect(view.viewport()->rect());
- QVERIFY(QTest::qWaitForWindowExposed(view.viewport()));
+ QVERIFY(QTest::qWaitForWindowExposed(view.viewport()->windowHandle()));
#ifdef Q_OS_MAC
// The black rectangle jumps from the center to the upper left for some reason.
QTest::qWait(100);