diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-11-22 08:58:25 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-24 11:33:07 +0000 |
commit | 6393bc91095339014bd86c04e16b6ac21c1f3f26 (patch) | |
tree | a87b0867e198f2574b5d2133acca7becdf9bc9ae /examples/quick | |
parent | ae9279b3145183f5b4815d85d8488c53846de707 (diff) |
Scenegraph examples: Use suffix-less RHI constants
Complements 23dbe3d6e0d3338812ad9f614028a6fdc5a54090.
Change-Id: Ic1bda49a888b0580ac483d650b879a9ae843129b
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 0b2311a62b25cbc34fd41bf0c9aef7e8327eb923)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/quick')
-rw-r--r-- | examples/quick/scenegraph/fboitem/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/scenegraph/openglunderqml/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/scenegraph/openglunderqml/squircle.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/quick/scenegraph/fboitem/main.cpp b/examples/quick/scenegraph/fboitem/main.cpp index 61510cdb93..f7fea90f6c 100644 --- a/examples/quick/scenegraph/fboitem/main.cpp +++ b/examples/quick/scenegraph/fboitem/main.cpp @@ -58,7 +58,7 @@ int main(int argc, char **argv) { QGuiApplication app(argc, argv); - QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi); + QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL); QQuickView view; view.setResizeMode(QQuickView::SizeRootObjectToView); diff --git a/examples/quick/scenegraph/openglunderqml/main.cpp b/examples/quick/scenegraph/openglunderqml/main.cpp index d92cbb2d80..5df329c425 100644 --- a/examples/quick/scenegraph/openglunderqml/main.cpp +++ b/examples/quick/scenegraph/openglunderqml/main.cpp @@ -59,7 +59,7 @@ int main(int argc, char **argv) { QGuiApplication app(argc, argv); - QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi); + QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL); QQuickView view; view.setResizeMode(QQuickView::SizeRootObjectToView); diff --git a/examples/quick/scenegraph/openglunderqml/squircle.cpp b/examples/quick/scenegraph/openglunderqml/squircle.cpp index d80309cbfb..2e224e77b0 100644 --- a/examples/quick/scenegraph/openglunderqml/squircle.cpp +++ b/examples/quick/scenegraph/openglunderqml/squircle.cpp @@ -137,7 +137,7 @@ void SquircleRenderer::init() { if (!m_program) { QSGRendererInterface *rif = m_window->rendererInterface(); - Q_ASSERT(rif->graphicsApi() == QSGRendererInterface::OpenGL || rif->graphicsApi() == QSGRendererInterface::OpenGLRhi); + Q_ASSERT(rif->graphicsApi() == QSGRendererInterface::OpenGL); initializeOpenGLFunctions(); |