summaryrefslogtreecommitdiffstats
path: root/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-07-24 14:29:01 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-25 17:32:21 +0200
commitaaaf60aeab64c4e9189dae6925a89e0b367e3dcf (patch)
tree6c2f3d4217245c7a61244a62f599206bd59c0a67 /tests/auto/opengl/qglthreads/tst_qglthreads.cpp
parentff453fa757c154e9234541c5cda47014a0803538 (diff)
Remove usage of deprecated qWaitForWindowShown(QWidget *) method.
Remove usages from autotests with the exception of widgets/kernel, widgets/widgets and widgets/graphicsview. Change-Id: I917b2857ed0cd07a6b3dbcd69244f558086c6586 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests/auto/opengl/qglthreads/tst_qglthreads.cpp')
-rw-r--r--tests/auto/opengl/qglthreads/tst_qglthreads.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
index aa5547908c..36a65ebbe2 100644
--- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
+++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
@@ -151,7 +151,7 @@ void tst_QGLThreads::swapInThread()
widget.setThread(&thread);
widget.show();
- QTest::qWaitForWindowShown(&widget);
+ QVERIFY(QTest::qWaitForWindowExposed(&widget));
thread.start();
while (thread.isRunning()) {
@@ -259,7 +259,7 @@ void tst_QGLThreads::textureUploadInThread()
connect(&thread, SIGNAL(createdAndUploaded(QImage)), &display, SLOT(receiveImage(QImage)));
display.show();
- QTest::qWaitForWindowShown(&display);
+ QVERIFY(QTest::qWaitForWindowActive(&display));
thread.start();
@@ -436,7 +436,7 @@ void tst_QGLThreads::renderInThread()
SceneRenderingThread thread(&widget);
widget.show();
- QTest::qWaitForWindowShown(&widget);
+ QVERIFY(QTest::qWaitForWindowExposed(&widget));
widget.doneCurrent();
thread.start();
@@ -470,7 +470,7 @@ public:
GLWidgetWrapper() {
widget.resize(150, 150);
widget.show();
- QTest::qWaitForWindowShown(&widget);
+ QTest::qWaitForWindowExposed(&widget);
widget.doneCurrent();
}
QPaintDevice *realPaintDevice() { return &widget; }