diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-12 20:36:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-12 20:36:48 +0200 |
| commit | 880a143eb572de3e8a6734cc663ed4b6e309b99d (patch) | |
| tree | 4d1ad149dff7d9708e5981ea7b0ec7f8aee24bbf /tests/auto/quick/rendernode | |
| parent | c433b78660923b6268653b437a2a04078de0f058 (diff) | |
| parent | a6057b46eebc71772d584ea5d318d130e2f40a19 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I4476733af61fcf3a2af1d121a4585c3fae1c240e
Diffstat (limited to 'tests/auto/quick/rendernode')
| -rw-r--r-- | tests/auto/quick/rendernode/tst_rendernode.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/auto/quick/rendernode/tst_rendernode.cpp b/tests/auto/quick/rendernode/tst_rendernode.cpp index b6028079f3..e75e9e30b9 100644 --- a/tests/auto/quick/rendernode/tst_rendernode.cpp +++ b/tests/auto/quick/rendernode/tst_rendernode.cpp @@ -49,8 +49,7 @@ public: view.setResizeMode(QQuickView::SizeViewToRootObject); view.setSource(testFileUrl(fileName)); view.setVisible(true); - QTest::qWaitForWindowExposed(&view); - return view.grabWindow(); + return QTest::qWaitForWindowExposed(&view) ? view.grabWindow() : QImage(); } //It is important for platforms that only are able to show fullscreen windows @@ -225,6 +224,7 @@ void tst_rendernode::renderOrder() QSKIP("Render nodes not yet supported with QRhi"); QImage fb = runTest("RenderOrder.qml"); + QVERIFY(!fb.isNull()); const qreal scaleFactor = QGuiApplication::primaryScreen()->devicePixelRatio(); QCOMPARE(fb.width(), qRound(200 * scaleFactor)); @@ -257,6 +257,7 @@ void tst_rendernode::messUpState() QSKIP("Render nodes not yet supported with QRhi"); QImage fb = runTest("MessUpState.qml"); + QVERIFY(!fb.isNull()); int x1 = 0; int x2 = fb.width() / 2; int x3 = fb.width() - 1; @@ -318,7 +319,7 @@ void tst_rendernode::matrix() qmlRegisterType<StateRecordingRenderNodeItem>("RenderNode", 1, 0, "StateRecorder"); StateRecordingRenderNode::matrices.clear(); - runTest("matrix.qml"); + QVERIFY(!runTest("matrix.qml").isNull()); QMatrix4x4 noRotateOffset; noRotateOffset.translate(20, 20); @@ -371,9 +372,10 @@ bool tst_rendernode::isRunningOnRhi() const decided = true; QQuickView dummy; dummy.show(); - QTest::qWaitForWindowExposed(&dummy); - QSGRendererInterface::GraphicsApi api = dummy.rendererInterface()->graphicsApi(); - retval = QSGRendererInterface::isApiRhiBased(api); + if (QTest::qWaitForWindowExposed(&dummy)) { + QSGRendererInterface::GraphicsApi api = dummy.rendererInterface()->graphicsApi(); + retval = QSGRendererInterface::isApiRhiBased(api); + } dummy.hide(); } return retval; |