summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/controlsunderlay
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2021-07-10 23:40:45 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-19 17:09:15 +0000
commit61058758ab8621c67e62902244bea9253d0517b4 (patch)
tree59e0cbe985877e8a355341b28e67456c61a7d17f /examples/qt3d/controlsunderlay
parent8d82331da9ccbca9e3cc4b7d8a952d855b1e525d (diff)
Disable RHI Renderer by default
RHI renderer use ShaderTools which is GPL licensed. This patch disables the plugin by default until Qt3D provides a suitable replacement for the dependency. To enable the RHI backend, compile Qt3D and pass parameter -DFEATURE_qt3d_rhi_renderer=ON to cmake. Unfortunate side effect of RHI backend being disabled is that when using Scene3D, the QtQuick renderer must be configured to use the opengl backend. [ChangeLog] RHI Backend is not longer built by default Task-number: QTBUG-94960 Change-Id: I0bff7523e159b800734b58bfef37e5088d0a0d41 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 3964b273459c2999f33d51b96afe6fb68f07d52f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/qt3d/controlsunderlay')
-rw-r--r--examples/qt3d/controlsunderlay/CMakeLists.txt2
-rw-r--r--examples/qt3d/controlsunderlay/main.cpp4
2 files changed, 6 insertions, 0 deletions
diff --git a/examples/qt3d/controlsunderlay/CMakeLists.txt b/examples/qt3d/controlsunderlay/CMakeLists.txt
index 1b65bc755..4bd5f086e 100644
--- a/examples/qt3d/controlsunderlay/CMakeLists.txt
+++ b/examples/qt3d/controlsunderlay/CMakeLists.txt
@@ -19,6 +19,7 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Qml)
find_package(Qt6 COMPONENTS Quick)
+find_package(Qt6 COMPONENTS 3DRender)
qt_add_executable(controlsunderlay
main.cpp
@@ -32,6 +33,7 @@ target_link_libraries(controlsunderlay PUBLIC
Qt::Gui
Qt::Qml
Qt::Quick
+ Qt::3DRender
)
diff --git a/examples/qt3d/controlsunderlay/main.cpp b/examples/qt3d/controlsunderlay/main.cpp
index cb3928a51..a19464911 100644
--- a/examples/qt3d/controlsunderlay/main.cpp
+++ b/examples/qt3d/controlsunderlay/main.cpp
@@ -50,12 +50,16 @@
#include <QGuiApplication>
#include <QQuickView>
+#include <Qt3DRender/qt3drender-config.h>
int main(int argc, char **argv)
{
QSurfaceFormat format;
format.setSamples(4);
QSurfaceFormat::setDefaultFormat(format);
+#if !QT_CONFIG(qt3d_rhi_renderer)
+ qputenv("QSG_RHI_BACKEND", "opengl");
+#endif
QGuiApplication app(argc, argv);