summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2017-06-01 12:04:12 +0200
committerPaul Lemire <paul.lemire@kdab.com>2018-03-16 13:50:19 +0000
commitf2fb6659a777cf968957bf8ce8499400d6167a16 (patch)
treea638f23f1d475c3a0461d94ac108d36a1ea21292
parent00b7e4b76ab0454178a7f6412100152cc52d0581 (diff)
Render: Add configure option for the OpenGL renderer
This is the first step in making the QRenderAspect more modular and not dependent on a single renderer forever. Change-Id: I27cecdcfda382859343f1b51fbe730bb998258fb Task-number: QTBUG-61151 Reviewed-by: Mike Krus <mike.krus@kdab.com>
-rw-r--r--configure.json1
-rw-r--r--src/render/configure.json31
-rw-r--r--src/render/qt3drender_global_p.h1
3 files changed, 33 insertions, 0 deletions
diff --git a/configure.json b/configure.json
index 7f7137cd1..1cb03323b 100644
--- a/configure.json
+++ b/configure.json
@@ -1,6 +1,7 @@
{
"subconfigs": [
"src/core",
+ "src/render",
"src/plugins/geometryloaders"
]
}
diff --git a/src/render/configure.json b/src/render/configure.json
new file mode 100644
index 000000000..ee5002707
--- /dev/null
+++ b/src/render/configure.json
@@ -0,0 +1,31 @@
+{
+ "module": "3drender",
+ "testDir": "./config.tests",
+
+ "commandline": {
+ "options": {
+ "qt3d-opengl-renderer": "boolean"
+ }
+ },
+
+ "features": {
+ "qt3d-opengl-renderer": {
+ "label": "OpenGL Renderer",
+ "purpose": "Use the OpenGL renderer",
+ "section": "Qt 3D Renderers",
+ "output": [ "privateFeature" ]
+ }
+ },
+
+ "report": [
+ ],
+
+ "summary": [
+ {
+ "section": "Qt 3D Renderers",
+ "entries": [
+ "qt3d-opengl-renderer"
+ ]
+ }
+ ]
+}
diff --git a/src/render/qt3drender_global_p.h b/src/render/qt3drender_global_p.h
index 4ec84555a..bdc35fd86 100644
--- a/src/render/qt3drender_global_p.h
+++ b/src/render/qt3drender_global_p.h
@@ -52,6 +52,7 @@
//
#include "qt3drender_global.h"
+#include <Qt3DRender/private/qt3drender-config_p.h>
#define QT3DRENDERSHARED_PRIVATE_EXPORT QT3DRENDERSHARED_EXPORT