diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2022-12-19 12:23:17 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2023-02-10 12:37:17 +0100 |
| commit | c889af388062bbee6e52e68a22ac8632fb12ff02 (patch) | |
| tree | 0b4823adb8ca383e0a55fcbeb6e262363c42e0e8 /src/extras | |
| parent | 390f724912eb73461295e68535e053eb27e28af9 (diff) | |
Remove Qt6 QT_VERSION checks from the code base
Those are left overs from the Qt 5.15 to Qt 6 port. Now that both
code based have diverged, there's no much point in keeping those
checks.
Pick-to: 6.5
Change-Id: I4e83876b6b4cb18b181af32e376f4411054a1183
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/extras')
| -rw-r--r-- | src/extras/defaults/qt3dwindow.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/extras/defaults/qt3dwindow.cpp b/src/extras/defaults/qt3dwindow.cpp index 19186978e..aa9661390 100644 --- a/src/extras/defaults/qt3dwindow.cpp +++ b/src/extras/defaults/qt3dwindow.cpp @@ -222,11 +222,7 @@ 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 } } @@ -235,7 +231,7 @@ void setupWindowSurface(QWindow *window, Qt3DRender::API api) noexcept // backend is in use will get a valid value. bool useRhi = false; if (qEnvironmentVariableIsEmpty("QT3D_RENDERER")) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_CONFIG(qt3d_rhi_renderer) +#if QT_CONFIG(qt3d_rhi_renderer) qputenv("QT3D_RENDERER", "rhi"); #else qputenv("QT3D_RENDERER", "opengl"); |