diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickrendererinfo/tst_qquickrendererinfo.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 10 | ||||
| -rw-r--r-- | tests/auto/quick/scenegraph/tst_scenegraph.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/quick/qquickrendererinfo/tst_qquickrendererinfo.cpp b/tests/auto/quick/qquickrendererinfo/tst_qquickrendererinfo.cpp index b9e8c30ea7..5e2da76333 100644 --- a/tests/auto/quick/qquickrendererinfo/tst_qquickrendererinfo.cpp +++ b/tests/auto/quick/qquickrendererinfo/tst_qquickrendererinfo.cpp @@ -58,7 +58,7 @@ void tst_QQuickRendererInfo::testProperties() QVERIFY(obj); QSGRendererInterface *rif = view.rendererInterface(); - const int expectedAPI = rif ? rif->graphicsAPI() : QSGRendererInterface::Unknown; + const int expectedAPI = rif ? rif->graphicsApi() : QSGRendererInterface::Unknown; QCOMPARE(obj->property("api").toInt(), expectedAPI); } diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 138f2759a4..0985198d65 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -393,7 +393,7 @@ void tst_qquickwindow::openglContextCreatedSignal() window.show(); QTest::qWaitForWindowExposed(&window); - if (window.rendererInterface()->graphicsAPI() != QSGRendererInterface::OpenGL) + if (window.rendererInterface()->graphicsApi() != QSGRendererInterface::OpenGL) QSKIP("Skipping OpenGL context test due to not running with OpenGL"); QVERIFY(spy.size() > 0); @@ -1240,7 +1240,7 @@ void tst_qquickwindow::headless() // Verify that the window is alive and kicking QVERIFY(window->isSceneGraphInitialized()); - const bool isGL = window->rendererInterface()->graphicsAPI() == QSGRendererInterface::OpenGL; + const bool isGL = window->rendererInterface()->graphicsApi() == QSGRendererInterface::OpenGL; // Store the visual result QImage originalContent = window->grabWindow(); @@ -1614,7 +1614,7 @@ void tst_qquickwindow::hideThenDelete() QTest::qWaitForWindowExposed(&window); const bool threaded = QQuickWindowPrivate::get(&window)->context->thread() != QGuiApplication::instance()->thread(); - const bool isGL = window.rendererInterface()->graphicsAPI() == QSGRendererInterface::OpenGL; + const bool isGL = window.rendererInterface()->graphicsApi() == QSGRendererInterface::OpenGL; #ifndef QT_NO_OPENGL if (isGL) openglDestroyed = new QSignalSpy(window.openglContext(), SIGNAL(aboutToBeDestroyed())); @@ -2044,7 +2044,7 @@ void tst_qquickwindow::defaultSurfaceFormat() window.show(); QVERIFY(QTest::qWaitForWindowExposed(&window)); - if (window.rendererInterface()->graphicsAPI() != QSGRendererInterface::OpenGL) + if (window.rendererInterface()->graphicsApi() != QSGRendererInterface::OpenGL) QSKIP("Skipping OpenGL context test due to not running with OpenGL"); const QSurfaceFormat reqFmt = window.requestedFormat(); @@ -2182,7 +2182,7 @@ void tst_qquickwindow::testRenderJob() QCOMPARE(completedJobs.size(), 1); #ifndef QT_NO_OPENGL - if (window.rendererInterface()->graphicsAPI() == QSGRendererInterface::OpenGL) { + if (window.rendererInterface()->graphicsApi() == QSGRendererInterface::OpenGL) { // Do a synchronized GL job. GLubyte readPixel[4] = {0, 0, 0, 0}; GlRenderJob *glJob = new GlRenderJob(readPixel); diff --git a/tests/auto/quick/scenegraph/tst_scenegraph.cpp b/tests/auto/quick/scenegraph/tst_scenegraph.cpp index 86f971041f..c0d1b53e92 100644 --- a/tests/auto/quick/scenegraph/tst_scenegraph.cpp +++ b/tests/auto/quick/scenegraph/tst_scenegraph.cpp @@ -439,7 +439,7 @@ void tst_SceneGraph::render() QQuickView dummy; dummy.show(); QTest::qWaitForWindowExposed(&dummy); - if (dummy.rendererInterface()->graphicsAPI() != QSGRendererInterface::OpenGL) + if (dummy.rendererInterface()->graphicsApi() != QSGRendererInterface::OpenGL) QSKIP("Skipping complex rendering tests due to not running with OpenGL"); dummy.hide(); @@ -506,7 +506,7 @@ void tst_SceneGraph::hideWithOtherContext() view.show(); QVERIFY(QTest::qWaitForWindowExposed(&view)); - if (view.rendererInterface()->graphicsAPI() != QSGRendererInterface::OpenGL) + if (view.rendererInterface()->graphicsApi() != QSGRendererInterface::OpenGL) QSKIP("Skipping OpenGL context test due to not running with OpenGL"); renderingOnMainThread = view.openglContext()->thread() == QGuiApplication::instance()->thread(); |