diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2021-01-29 07:58:46 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2021-02-24 09:32:05 +0100 |
| commit | ab12864bb27100edc1e9ba7409a135eecd36ef54 (patch) | |
| tree | 499caaba3ca40b98af6fdc2b8d419aed9175ec46 /src | |
| parent | d926af4dd3a0b17cb46514ee4909a966871cc08f (diff) | |
Qt3DWindow: request OpenGL API and renderer on 5.15
Change-Id: I7178d336472400d42496f06cd9649d9a48e4b21c
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/extras/defaults/qt3dwindow.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/extras/defaults/qt3dwindow.cpp b/src/extras/defaults/qt3dwindow.cpp index 1b809c168..e233aee42 100644 --- a/src/extras/defaults/qt3dwindow.cpp +++ b/src/extras/defaults/qt3dwindow.cpp @@ -265,18 +265,26 @@ void setupWindowSurface(QWindow *window, Qt3DRender::API api) noexcept } else if (userRequestedApi == QByteArrayLiteral("null")) { api = Qt3DRender::API::Null; } else if (userRequestedApi == QByteArrayLiteral("auto")) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) api = Qt3DRender::API::RHI; +#else + api = Qt3DRender::API::OpenGL; +#endif } } // Default to using RHI backend is not specified We want to set the // variable to ensure any 3rd party relying on it to detect which rendering // backend is in use will get a valid value. - bool useRhi = true; - if (qEnvironmentVariableIsEmpty("QT3D_RENDERER")) + bool useRhi = false; + if (qEnvironmentVariableIsEmpty("QT3D_RENDERER")) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) qputenv("QT3D_RENDERER", "rhi"); - else - useRhi = qEnvironmentVariable("QT3D_RENDERER") == QStringLiteral("rhi"); +#else + qputenv("QT3D_RENDERER", "opengl"); +#endif + } + useRhi = qEnvironmentVariable("QT3D_RENDERER") == QStringLiteral("rhi"); if (!useRhi) api = Qt3DRender::API::OpenGL; |