Rename QOpenGLFilter to QGraphicsApiFilter

This API change is part of an effort to remove anything specific to one
graphics API (in this case OpenGL) from the public APIs. In addition to
the name of the class being changed, the QGraphicsApiFilter::Api has
been refactored to reference the Graphics API, rather than an OpenGL
API. Now this list includes OpenGL, and OpenGLES, but could also include
Vulkan, DirectX, or any other graphics rendering API we wish to support
in the future.  Right now the properties in this class are still
reflective of the OpenGL APIs, and may need to be extended with other
properties in the future for other rendering technologies.

The QGraphicsApiFilter::Profile enum has also been changed to be more
more clear.  So for now there are enums NoProfile, CoreProfile, and
CompatibilityProfile.

Task-number:QTBUG-49078

Change-Id: Ib5f9c3b7adee5badec6bce8a12b23683eb43b4cb
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

61 files changed, 502 insertions, 502 deletions

diff --git a/examples/qt3d/bigscene-instanced-qml/main.qml b/examples/qt3d/bigscene-instanced-qml/main.qml
index c1ff7ff2f..699e8d305 100644
--- a/examples/qt3d/bigscene-instanced-qml/main.qml
+++ b/examples/qt3d/bigscene-instanced-qml/main.qml
@@ -72,9 +72,9 @@ Entity {
         id: instancedPhongMaterial
         effect: Effect {
             techniques: Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.Core
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.CoreProfile
                     minorVersion: 2
                     majorVersion: 3
                 }
diff --git a/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml b/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml
index a50818be8..0be92543e 100644
--- a/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml
+++ b/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml
@@ -54,9 +54,9 @@ Effect {
     techniques: [
         Technique {
 
-            openGLFilter {
-                api: OpenGLFilter.Desktop
-                profile: OpenGLFilter.None
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
+                profile: GraphicsApiFilter.NoProfile
                 majorVersion: 3
                 minorVersion: 2
             }
diff --git a/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml b/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml
index 27468af8f..36305b4d2 100644
--- a/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml
+++ b/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml
@@ -53,9 +53,9 @@ Effect {
     techniques: [
         Technique {
 
-            openGLFilter {
-                api: OpenGLFilter.Desktop
-                profile: OpenGLFilter.None
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
+                profile: GraphicsApiFilter.NoProfile
                 majorVersion: 3
                 minorVersion: 2
             }
diff --git a/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml b/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml
index 78d5f478d..2694a8999 100644
--- a/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml
+++ b/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml
@@ -73,9 +73,9 @@ Material {
         techniques: [
             // GL 3 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.Core
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.CoreProfile
                     majorVersion: 3
                     minorVersion: 1
                 }
@@ -95,9 +95,9 @@ Material {
 
             // GL 2 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
index fae61c78d..ebbcfa357 100644
--- a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
@@ -36,7 +36,7 @@
 
 #include "finaleffect.h"
 
-#include <Qt3DRender/QOpenGLFilter>
+#include <Qt3DRender/QGraphicsApiFilter>
 #include <Qt3DRender/QShaderProgram>
 #include <QUrl>
 
@@ -48,15 +48,15 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent)
     , m_gl3Pass(new Qt3DRender::QRenderPass())
     , m_passCriterion(new Qt3DRender::QAnnotation(this))
 {
-    m_gl3Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
-    m_gl3Technique->openGLFilter()->setMajorVersion(3);
-    m_gl3Technique->openGLFilter()->setMinorVersion(1);
-    m_gl3Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::Core);
+    m_gl3Technique->graphicsApiFilter()->setApi(Qt3DRender::QGraphicsApiFilter::OpenGL);
+    m_gl3Technique->graphicsApiFilter()->setMajorVersion(3);
+    m_gl3Technique->graphicsApiFilter()->setMinorVersion(1);
+    m_gl3Technique->graphicsApiFilter()->setProfile(Qt3DRender::QGraphicsApiFilter::CoreProfile);
 
-    m_gl2Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
-    m_gl2Technique->openGLFilter()->setMajorVersion(2);
-    m_gl2Technique->openGLFilter()->setMinorVersion(0);
-    m_gl2Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::None);
+    m_gl2Technique->graphicsApiFilter()->setApi(Qt3DRender::QGraphicsApiFilter::OpenGL);
+    m_gl2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_gl2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_gl2Technique->graphicsApiFilter()->setProfile(Qt3DRender::QGraphicsApiFilter::NoProfile);
 
     m_passCriterion->setName(QStringLiteral("pass"));
     m_passCriterion->setValue(QStringLiteral("final"));
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
index 64add3ef7..7ea21cc24 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
@@ -36,7 +36,7 @@
 
 #include "sceneeffect.h"
 
-#include <Qt3DRender/QOpenGLFilter>
+#include <Qt3DRender/QGraphicsApiFilter>
 #include <Qt3DRender/QShaderProgram>
 #include <QUrl>
 
@@ -49,15 +49,15 @@ SceneEffect::SceneEffect(Qt3DCore::QNode *parent)
     , m_passCriterion(new Qt3DRender::QAnnotation(this))
 {
 
-    m_gl3Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::None);
-    m_gl3Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
-    m_gl3Technique->openGLFilter()->setMajorVersion(3);
-    m_gl3Technique->openGLFilter()->setMinorVersion(3);
+    m_gl3Technique->graphicsApiFilter()->setProfile(Qt3DRender::QGraphicsApiFilter::NoProfile);
+    m_gl3Technique->graphicsApiFilter()->setApi(Qt3DRender::QGraphicsApiFilter::OpenGL);
+    m_gl3Technique->graphicsApiFilter()->setMajorVersion(3);
+    m_gl3Technique->graphicsApiFilter()->setMinorVersion(3);
 
-    m_gl2Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
-    m_gl2Technique->openGLFilter()->setMajorVersion(2);
-    m_gl2Technique->openGLFilter()->setMinorVersion(0);
-    m_gl2Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::None);
+    m_gl2Technique->graphicsApiFilter()->setApi(Qt3DRender::QGraphicsApiFilter::OpenGL);
+    m_gl2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_gl2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_gl2Technique->graphicsApiFilter()->setProfile(Qt3DRender::QGraphicsApiFilter::NoProfile);
 
 
     m_passCriterion->setName(QStringLiteral("pass"));
diff --git a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml
index d754597c8..5acead772 100644
--- a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml
+++ b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml
@@ -41,7 +41,7 @@ Effect {
     techniques : [
         // OpenGL 3.1
         Technique {
-            openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
+            graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.CoreProfile; minorVersion : 1; majorVersion : 3 }
             parameters:  Parameter { name: "PointLightBlock"; value: ShaderData {
                     property ShaderDataArray lights: ShaderDataArray {
                         // hard coded lights until we have a way to filter
@@ -109,7 +109,7 @@ Effect {
         },
         // OpenGL 2.0 with FBO extension
         Technique {
-            openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.None; minorVersion : 0; majorVersion : 2 }
+            graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.NoProfile; minorVersion : 0; majorVersion : 2 }
             parameters: Parameter { name: "pointLights"; value: ShaderData {
                                 property ShaderDataArray lights: ShaderDataArray {
                                     // hard coded lights until we have a way to filter
diff --git a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml
index 1e4e9f450..5dbc3ed9d 100644
--- a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml
+++ b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml
@@ -42,7 +42,7 @@ Effect {
     techniques : [
         // OpenGL 3.1
         Technique {
-            openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
+            graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.CoreProfile; minorVersion : 1; majorVersion : 3 }
             renderPasses : RenderPass {
                 annotations : Annotation { name : "pass"; value : "geometry" }
                 shaderProgram : ShaderProgram {
@@ -93,7 +93,7 @@ Effect {
         },
         // OpenGL 2.0
         Technique {
-            openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 0; majorVersion : 2 }
+            graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.CoreProfile; minorVersion : 0; majorVersion : 2 }
             renderPasses : RenderPass {
                 annotations : Annotation { name : "pass"; value : "geometry" }
                 shaderProgram : ShaderProgram {
diff --git a/examples/qt3d/instanced-arrays-qml/main.qml b/examples/qt3d/instanced-arrays-qml/main.qml
index 7f944a8fe..c1bf01dda 100644
--- a/examples/qt3d/instanced-arrays-qml/main.qml
+++ b/examples/qt3d/instanced-arrays-qml/main.qml
@@ -70,9 +70,9 @@ Entity {
         id: instancedPhongMaterial
         effect: Effect {
             techniques: Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.Core
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.CoreProfile
                     minorVersion: 2
                     majorVersion: 3
                 }
diff --git a/examples/qt3d/planets-qml/CloudEffectDS.qml b/examples/qt3d/planets-qml/CloudEffectDS.qml
index 8d51440a6..836349c9b 100644
--- a/examples/qt3d/planets-qml/CloudEffectDS.qml
+++ b/examples/qt3d/planets-qml/CloudEffectDS.qml
@@ -51,9 +51,9 @@ Effect {
 
     techniques: [
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
-                profile: OpenGLFilter.Core
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
+                profile: GraphicsApiFilter.CoreProfile
                 majorVersion: 3
                 minorVersion: 2
             }
@@ -82,8 +82,8 @@ Effect {
             ]
         },
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
                 majorVersion: 2
             }
 
@@ -112,8 +112,8 @@ Effect {
             ]
         },
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.ES
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGLES
                 majorVersion: 2
                 minorVersion: 0
             }
diff --git a/examples/qt3d/planets-qml/PlanetEffectD.qml b/examples/qt3d/planets-qml/PlanetEffectD.qml
index eb0ecd2ba..f054db69e 100644
--- a/examples/qt3d/planets-qml/PlanetEffectD.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectD.qml
@@ -52,9 +52,9 @@ Effect {
 
     techniques: [
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
-                profile: OpenGLFilter.Core
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
+                profile: GraphicsApiFilter.CoreProfile
                 majorVersion: 3
                 minorVersion: 2
             }
@@ -89,8 +89,8 @@ Effect {
             ]
         },
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
                 majorVersion: 2
             }
 
@@ -124,8 +124,8 @@ Effect {
             ]
         },
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.ES
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGLES
                 majorVersion: 2
                 minorVersion: 0
             }
diff --git a/examples/qt3d/planets-qml/PlanetEffectDB.qml b/examples/qt3d/planets-qml/PlanetEffectDB.qml
index 7c5c1931a..210a3390d 100644
--- a/examples/qt3d/planets-qml/PlanetEffectDB.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectDB.qml
@@ -52,9 +52,9 @@ Effect {
 
     techniques: [
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
-                profile: OpenGLFilter.Core
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
+                profile: GraphicsApiFilter.CoreProfile
                 majorVersion: 3
                 minorVersion: 2
             }
@@ -89,8 +89,8 @@ Effect {
             ]
         },
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
                 majorVersion: 2
             }
 
@@ -124,8 +124,8 @@ Effect {
             ]
         },
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.ES
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGLES
                 majorVersion: 2
                 minorVersion: 0
             }
diff --git a/examples/qt3d/planets-qml/PlanetEffectDSB.qml b/examples/qt3d/planets-qml/PlanetEffectDSB.qml
index e3f6a39c0..3e9e231bb 100644
--- a/examples/qt3d/planets-qml/PlanetEffectDSB.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectDSB.qml
@@ -52,9 +52,9 @@ Effect {
 
     techniques: [
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
-                profile: OpenGLFilter.Core
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
+                profile: GraphicsApiFilter.CoreProfile
                 majorVersion: 3
                 minorVersion: 2
             }
@@ -84,8 +84,8 @@ Effect {
             ]
         },
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
                 majorVersion: 2
             }
 
@@ -114,8 +114,8 @@ Effect {
             ]
         },
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.ES
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGLES
                 majorVersion: 2
                 minorVersion: 0
             }
diff --git a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
index 8698ca6ec..ea589f491 100644
--- a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
+++ b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
@@ -53,9 +53,9 @@ Effect {
 
     techniques: [
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
-                profile: OpenGLFilter.Core
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
+                profile: GraphicsApiFilter.CoreProfile
                 majorVersion: 3
                 minorVersion: 2
             }
@@ -103,8 +103,8 @@ Effect {
             ]
         },
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
                 majorVersion: 2
             }
 
@@ -138,8 +138,8 @@ Effect {
             ]
         },
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.ES
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGLES
                 majorVersion: 2
                 minorVersion: 0
             }
diff --git a/examples/qt3d/plasma/main.qml b/examples/qt3d/plasma/main.qml
index 7f37ea344..1c4cb45ea 100644
--- a/examples/qt3d/plasma/main.qml
+++ b/examples/qt3d/plasma/main.qml
@@ -66,11 +66,11 @@ Entity {
                 effect: Effect {
                     techniques: Technique {
 
-                        openGLFilter {
+                        graphicsApiFilter {
                             minorVersion: 3
                             majorVersion: 2
-                            api: OpenGLFilter.Desktop
-                            profile: OpenGLFilter.Core
+                            api: GraphicsApiFilter.OpenGL
+                            profile: GraphicsApiFilter.CoreProfile
                         }
 
                         renderPasses: RenderPass {
diff --git a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
index 172b7ade8..511c433bb 100644
--- a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
+++ b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
@@ -133,7 +133,7 @@ Material {
         techniques : [
             // OpenGL 3.1 Technique
             Technique {
-                openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
+                graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.CoreProfile; minorVersion : 1; majorVersion : 3 }
 
                 annotations: [
                     Annotation { name : "RenderingStyle"; value : "forward"},
diff --git a/examples/qt3d/playground-qml/ComplexTechnique.qml b/examples/qt3d/playground-qml/ComplexTechnique.qml
index 6b4b3210c..f9d44249a 100644
--- a/examples/qt3d/playground-qml/ComplexTechnique.qml
+++ b/examples/qt3d/playground-qml/ComplexTechnique.qml
@@ -42,7 +42,7 @@ Technique {
         Annotation { name : "RenderingStyle"; value : "forward"},
         Annotation { name : "Enabled"; value : true}
     ]
-    openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
+    graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.CoreProfile; minorVersion : 1; majorVersion : 3 }
     renderPasses : [
         RenderPass {
             annotations : [Annotation {name : "Name"; value : "TextureLighting" }]
diff --git a/examples/qt3d/shadow-map-qml/AdsEffect.qml b/examples/qt3d/shadow-map-qml/AdsEffect.qml
index 79d76232f..a965c94af 100644
--- a/examples/qt3d/shadow-map-qml/AdsEffect.qml
+++ b/examples/qt3d/shadow-map-qml/AdsEffect.qml
@@ -61,9 +61,9 @@ Effect {
 
     techniques: [
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
-                profile: OpenGLFilter.Core
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
+                profile: GraphicsApiFilter.CoreProfile
                 majorVersion: 3
                 minorVersion: 2
             }
@@ -107,8 +107,8 @@ Effect {
             ]
         },
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.ES
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGLES
                 majorVersion: 3
                 minorVersion: 0
             }
diff --git a/examples/qt3d/simple-shaders-qml/main.qml b/examples/qt3d/simple-shaders-qml/main.qml
index e92d0fe7e..ce83c01a9 100644
--- a/examples/qt3d/simple-shaders-qml/main.qml
+++ b/examples/qt3d/simple-shaders-qml/main.qml
@@ -93,11 +93,11 @@ Entity {
             effect: Effect {
                 techniques: [
                     Technique {
-                        openGLFilter {
-                            api: OpenGLFilter.Desktop
+                        graphicsApiFilter {
+                            api: GraphicsApiFilter.OpenGL
                             majorVersion: 3
                             minorVersion: 2
-                            profile: OpenGLFilter.Core
+                            profile: GraphicsApiFilter.CoreProfile
                         }
 
                         renderPasses: RenderPass {
@@ -173,11 +173,11 @@ Entity {
             effect: Effect {
                 techniques: [
                     Technique {
-                        openGLFilter {
-                            api: OpenGLFilter.Desktop
+                        graphicsApiFilter {
+                            api: GraphicsApiFilter.OpenGL
                             majorVersion: 3
                             minorVersion: 2
-                            profile: OpenGLFilter.Core
+                            profile: GraphicsApiFilter.CoreProfile
                         }
 
                         renderPasses: RenderPass {
diff --git a/examples/qt3d/skybox/Skybox.qml b/examples/qt3d/skybox/Skybox.qml
index 0bf560cce..0d69c3434 100644
--- a/examples/qt3d/skybox/Skybox.qml
+++ b/examples/qt3d/skybox/Skybox.qml
@@ -91,9 +91,9 @@ Entity {
             techniques: [
                 // GL3 Technique
                 Technique {
-                    openGLFilter {
-                        api: OpenGLFilter.Desktop
-                        profile: OpenGLFilter.Core
+                    graphicsApiFilter {
+                        api: GraphicsApiFilter.OpenGL
+                        profile: GraphicsApiFilter.CoreProfile
                         majorVersion: 3
                         minorVersion: 1
                     }
@@ -107,9 +107,9 @@ Entity {
                     }
                 },
                 Technique {
-                    openGLFilter {
-                        api: OpenGLFilter.Desktop
-                        profile: OpenGLFilter.None
+                    graphicsApiFilter {
+                        api: GraphicsApiFilter.OpenGL
+                        profile: GraphicsApiFilter.NoProfile
                         majorVersion: 2
                         minorVersion: 0
                     }
@@ -122,9 +122,9 @@ Entity {
                     }
                 },
                 Technique {
-                    openGLFilter {
-                        api: OpenGLFilter.ES
-                        profile: OpenGLFilter.None
+                    graphicsApiFilter {
+                        api: GraphicsApiFilter.OpenGLES
+                        profile: GraphicsApiFilter.NoProfile
                         majorVersion: 2
                         minorVersion: 0
                     }
diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
index 3ed399d51..f3cfb942c 100644
--- a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
+++ b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
@@ -59,9 +59,9 @@ Effect {
 
     techniques: [
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
-                profile: OpenGLFilter.Core
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
+                profile: GraphicsApiFilter.CoreProfile
                 majorVersion: 4
                 minorVersion: 0
             }
diff --git a/examples/qt3d/transparency-qml-scene3d/Scene.qml b/examples/qt3d/transparency-qml-scene3d/Scene.qml
index 6aac9a243..51cc79d7a 100644
--- a/examples/qt3d/transparency-qml-scene3d/Scene.qml
+++ b/examples/qt3d/transparency-qml-scene3d/Scene.qml
@@ -130,9 +130,9 @@ Entity {
             techniques: [
                 Technique
                 {
-                    openGLFilter {
-                        api: OpenGLFilter.Desktop
-                        profile: OpenGLFilter.None
+                    graphicsApiFilter {
+                        api: GraphicsApiFilter.OpenGL
+                        profile: GraphicsApiFilter.NoProfile
                         majorVersion: 2
                         minorVersion: 0
                     }
@@ -154,9 +154,9 @@ Entity {
                 },
                 Technique
                 {
-                    openGLFilter {
-                        api: OpenGLFilter.ES
-                        profile: OpenGLFilter.None
+                    graphicsApiFilter {
+                        api: GraphicsApiFilter.OpenGLES
+                        profile: GraphicsApiFilter.NoProfile
                         majorVersion: 2
                         minorVersion: 0
                     }
diff --git a/examples/qt3d/transparency-qml/main.qml b/examples/qt3d/transparency-qml/main.qml
index f702bd2de..d9639f819 100644
--- a/examples/qt3d/transparency-qml/main.qml
+++ b/examples/qt3d/transparency-qml/main.qml
@@ -131,9 +131,9 @@ Entity {
             techniques: [
                 Technique
                 {
-                    openGLFilter {
-                        api: OpenGLFilter.Desktop
-                        profile: OpenGLFilter.None
+                    graphicsApiFilter {
+                        api: GraphicsApiFilter.OpenGL
+                        profile: GraphicsApiFilter.NoProfile
                         majorVersion: 2
                         minorVersion: 0
                     }
@@ -155,9 +155,9 @@ Entity {
                 },
                 Technique
                 {
-                    openGLFilter {
-                        api: OpenGLFilter.ES
-                        profile: OpenGLFilter.None
+                    graphicsApiFilter {
+                        api: GraphicsApiFilter.OpenGLES
+                        profile: GraphicsApiFilter.NoProfile
                         majorVersion: 2
                         minorVersion: 0
                     }
diff --git a/examples/qt3d/wave/BackgroundEffect.qml b/examples/qt3d/wave/BackgroundEffect.qml
index ffd670d54..16b9670a9 100644
--- a/examples/qt3d/wave/BackgroundEffect.qml
+++ b/examples/qt3d/wave/BackgroundEffect.qml
@@ -42,9 +42,9 @@ Effect {
 
     techniques: [
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
-                profile: OpenGLFilter.Core
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
+                profile: GraphicsApiFilter.CoreProfile
                 majorVersion: 3
                 minorVersion: 1
             }
diff --git a/examples/qt3d/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml
index 58483a7d3..b83069163 100644
--- a/examples/qt3d/wave/WaveEffect.qml
+++ b/examples/qt3d/wave/WaveEffect.qml
@@ -57,9 +57,9 @@ Effect {
 
     techniques: [
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
-                profile: OpenGLFilter.Core
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
+                profile: GraphicsApiFilter.CoreProfile
                 majorVersion: 3
                 minorVersion: 2
             }
diff --git a/examples/qt3d/wireframe/WireframeEffect.qml b/examples/qt3d/wireframe/WireframeEffect.qml
index 653798428..b00e4cdc7 100644
--- a/examples/qt3d/wireframe/WireframeEffect.qml
+++ b/examples/qt3d/wireframe/WireframeEffect.qml
@@ -49,9 +49,9 @@ Effect {
 
     techniques: [
         Technique {
-            openGLFilter {
-                api: OpenGLFilter.Desktop
-                profile: OpenGLFilter.Core
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
+                profile: GraphicsApiFilter.CoreProfile
                 majorVersion: 3
                 minorVersion: 1
             }
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp
index 7fbbd7933..07399716f 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp
@@ -63,7 +63,7 @@
 #include <Qt3DRender/QGeometry>
 #include <Qt3DRender/QGeometryRenderer>
 #include <Qt3DRender/QMaterial>
-#include <Qt3DRender/QOpenGLFilter>
+#include <Qt3DRender/QGraphicsApiFilter>
 #include <Qt3DRender/QParameter>
 #include <Qt3DRender/QParameterMapping>
 #include <Qt3DRender/QPolygonOffset>
@@ -492,10 +492,10 @@ QMaterial* GLTFParser::material(const QString &id)
         return NULL;
     }
     QTechnique *technique = m_techniques.value(techniqueName);
-    technique->openGLFilter()->setApi(QOpenGLFilter::ES);
-    technique->openGLFilter()->setMajorVersion(2);
-    technique->openGLFilter()->setMinorVersion(0);
-    technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGLES);
+    technique->graphicsApiFilter()->setMajorVersion(2);
+    technique->graphicsApiFilter()->setMinorVersion(0);
+    technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
 
     //Optional Core technique
@@ -508,10 +508,10 @@ QMaterial* GLTFParser::material(const QString &id)
                                      << "for material" << id << "in GLTF file" << m_basePath;
         } else {
             coreTechnique = m_techniques.value(coreTechniqueName);
-            coreTechnique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-            coreTechnique->openGLFilter()->setMajorVersion(3);
-            coreTechnique->openGLFilter()->setMinorVersion(1);
-            coreTechnique->openGLFilter()->setProfile(QOpenGLFilter::Core);
+            coreTechnique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+            coreTechnique->graphicsApiFilter()->setMajorVersion(3);
+            coreTechnique->graphicsApiFilter()->setMinorVersion(1);
+            coreTechnique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::CoreProfile);
         }
     }
     //Optional GL2 technique
@@ -522,10 +522,10 @@ QMaterial* GLTFParser::material(const QString &id)
                                      << "for material" << id << "in GLTF file" << m_basePath;
         } else {
             gl2Technique = m_techniques.value(gl2TechniqueName);
-            gl2Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-            gl2Technique->openGLFilter()->setMajorVersion(2);
-            gl2Technique->openGLFilter()->setMinorVersion(0);
-            gl2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+            gl2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+            gl2Technique->graphicsApiFilter()->setMajorVersion(2);
+            gl2Technique->graphicsApiFilter()->setMinorVersion(0);
+            gl2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
         }
     }
 
diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
index ef5cf5aba..4a26617d8 100644
--- a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
@@ -90,9 +90,9 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.Core
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.CoreProfile
                     majorVersion: 3
                     minorVersion: 1
                 }
@@ -101,9 +101,9 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
@@ -112,9 +112,9 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.ES
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGLES
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
index c93618f3c..b05acdb8f 100644
--- a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
@@ -103,9 +103,9 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.Core
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.CoreProfile
                     majorVersion: 3
                     minorVersion: 1
                 }
@@ -114,9 +114,9 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
@@ -125,9 +125,9 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.ES
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGLES
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
diff --git a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml
index a12754506..f3f153162 100644
--- a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml
@@ -74,9 +74,9 @@ Material {
         techniques: [
             // GL 3 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.Core
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.CoreProfile
                     majorVersion: 3
                     minorVersion: 2
                 }
@@ -87,9 +87,9 @@ Material {
 
             // GL 2 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
@@ -100,9 +100,9 @@ Material {
 
             // ES 2 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.ES
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGLES
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
index 2d028bce6..459434765 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
@@ -108,9 +108,9 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.Core
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.CoreProfile
                     majorVersion: 3
                     minorVersion: 1
                 }
@@ -119,9 +119,9 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
@@ -130,9 +130,9 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.ES
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGLES
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
index 719ac90e7..ebbe8683c 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
@@ -105,9 +105,9 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.Core
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.CoreProfile
                     majorVersion: 3
                     minorVersion: 1
                 }
@@ -116,9 +116,9 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
@@ -127,9 +127,9 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.ES
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGLES
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
index 42302f32f..36de0b302 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
@@ -118,9 +118,9 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.Core
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.CoreProfile
                     majorVersion: 3
                     minorVersion: 1
                 }
@@ -129,9 +129,9 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
@@ -140,9 +140,9 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.ES
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGLES
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
diff --git a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml
index 6b8cd57cc..de5cda4b4 100644
--- a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml
@@ -61,9 +61,9 @@ Material {
         techniques: [
             // GL 3 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.Core
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.CoreProfile
                     majorVersion: 3
                     minorVersion: 1
                 }
@@ -74,9 +74,9 @@ Material {
 
             // GL 2 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
@@ -87,9 +87,9 @@ Material {
 
             // ES 2 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.ES
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGLES
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
diff --git a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml
index 13e4b6f33..ecb93e04e 100644
--- a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml
@@ -73,9 +73,9 @@ Material {
         techniques: [
             // GL 3 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.Core
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.CoreProfile
                     majorVersion: 3
                     minorVersion: 1
                 }
@@ -94,9 +94,9 @@ Material {
 
             // GL 2 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
@@ -115,9 +115,9 @@ Material {
 
             // ES 2 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.ES
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGLES
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
diff --git a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml
index 99fa247bb..c136ccd52 100644
--- a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml
@@ -71,9 +71,9 @@ Material {
         techniques: [
             // GL 3 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.Core
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.CoreProfile
                     majorVersion: 3
                     minorVersion: 1
                 }
@@ -84,9 +84,9 @@ Material {
 
             // GL 2 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
@@ -97,9 +97,9 @@ Material {
 
             // ES 2 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.ES
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGLES
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
diff --git a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
index 9763a321a..bc1afc237 100644
--- a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
+++ b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
@@ -91,9 +91,9 @@ Entity {
             techniques: [
                 // GL3 Technique
                 Technique {
-                    openGLFilter {
-                        api: OpenGLFilter.Desktop
-                        profile: OpenGLFilter.Core
+                    graphicsApiFilter {
+                        api: GraphicsApiFilter.OpenGL
+                        profile: GraphicsApiFilter.CoreProfile
                         majorVersion: 3
                         minorVersion: 1
                     }
@@ -107,9 +107,9 @@ Entity {
                     }
                 },
                 Technique {
-                    openGLFilter {
-                        api: OpenGLFilter.Desktop
-                        profile: OpenGLFilter.None
+                    graphicsApiFilter {
+                        api: GraphicsApiFilter.OpenGL
+                        profile: GraphicsApiFilter.NoProfile
                         majorVersion: 2
                         minorVersion: 0
                     }
@@ -122,9 +122,9 @@ Entity {
                     }
                 },
                 Technique {
-                    openGLFilter {
-                        api: OpenGLFilter.ES
-                        profile: OpenGLFilter.None
+                    graphicsApiFilter {
+                        api: GraphicsApiFilter.OpenGLES
+                        profile: GraphicsApiFilter.NoProfile
                         majorVersion: 2
                         minorVersion: 0
                     }
diff --git a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
index 0b7661aff..69d276f86 100644
--- a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
@@ -72,9 +72,9 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
-                    profile: OpenGLFilter.Core
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
+                    profile: GraphicsApiFilter.CoreProfile
                     majorVersion: 3
                     minorVersion: 1
                 }
@@ -85,8 +85,8 @@ Material {
 
             // GL 2 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.Desktop
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGL
                     majorVersion: 2
                     minorVersion: 0
                 }
@@ -97,9 +97,9 @@ Material {
 
             // ES 2 Technique
             Technique {
-                openGLFilter {
-                    api: OpenGLFilter.ES
-                    profile: OpenGLFilter.None
+                graphicsApiFilter {
+                    api: GraphicsApiFilter.OpenGLES
+                    profile: GraphicsApiFilter.NoProfile
                     majorVersion: 2
                     minorVersion: 0
                 }
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index ae9ec3f92..ccefd3769 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -64,7 +64,7 @@
 #include <Qt3DRender/qspotlight.h>
 #include <Qt3DRender/qdirectionallight.h>
 #include <Qt3DRender/qpointlight.h>
-#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qgraphicsapifilter.h>
 #include <Qt3DRender/qrenderstate.h>
 #include <Qt3DRender/qblendstate.h>
 #include <Qt3DRender/qblendequation.h>
@@ -173,7 +173,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
     Qt3DRender::Quick::registerExtendedType<Qt3DRender::QEffect, Qt3DRender::Render::Quick::Quick3DEffect>("QEffect", "Qt3D.Render/Effect", uri, 2, 0, "Effect");
     Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTechnique, Qt3DRender::Render::Quick::Quick3DTechnique>("QTechnique", "Qt3D.Render/Technique", uri, 2, 0, "Technique");
     qmlRegisterType<Qt3DRender::QAnnotation>(uri, 2, 0, "Annotation");
-    qmlRegisterType<Qt3DRender::QOpenGLFilter>(uri, 2, 0, "OpenGLFilter");
+    qmlRegisterType<Qt3DRender::QGraphicsApiFilter>(uri, 2, 0, "GraphicsApiFilter");
     qmlRegisterUncreatableType<Qt3DRender::QParameter>(uri, 2, 0, "QParameter", "Quick3D should instantiate Quick3DParameter only");
     qmlRegisterType<Qt3DRender::Render::Quick::Quick3DParameter>(uri, 2, 0, "Parameter");
     qmlRegisterType<Qt3DRender::QParameterMapping>(uri, 2, 0, "ParameterMapping");
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index 4a2a62f27..78aec56ed 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -1079,7 +1079,7 @@ QList<QMouseEvent> Renderer::pendingPickingEvents() const
     return m_pickEventFilter->pendingEvents();
 }
 
-QOpenGLFilter *Renderer::contextInfo() const
+QGraphicsApiFilter *Renderer::contextInfo() const
 {
     return m_graphicsContext->contextInfo();
 }
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h
index 7793922f7..c9781586c 100644
--- a/src/render/backend/renderer_p.h
+++ b/src/render/backend/renderer_p.h
@@ -89,7 +89,7 @@ class QShaderProgram;
 class QMesh;
 class QRenderPass;
 class QAbstractShapeMesh;
-class QOpenGLFilter;
+class QGraphicsApiFilter;
 class AbstractSceneParser;
 
 namespace Render {
@@ -213,7 +213,7 @@ public:
 
     QList<QMouseEvent> pendingPickingEvents() const;
 
-    QOpenGLFilter *contextInfo() const;
+    QGraphicsApiFilter *contextInfo() const;
 
     void setSurface(QSurface *s);
     inline QSurface *surface() const { return m_surface; }
diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp
index 619547bcf..6906177e0 100644
--- a/src/render/defaults/qdiffusemapmaterial.cpp
+++ b/src/render/defaults/qdiffusemapmaterial.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DRender/qshaderprogram.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qrenderpass.h>
-#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qgraphicsapifilter.h>
 #include <QUrl>
 #include <QVector3D>
 #include <QVector4D>
@@ -90,20 +90,20 @@ void QDiffuseMapMaterialPrivate::init()
     m_diffuseMapGL2ES2Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/diffusemap.vert"))));
     m_diffuseMapGL2ES2Shader->setFragmentShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/diffusemap.frag"))));
 
-    m_diffuseMapGL3Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_diffuseMapGL3Technique->openGLFilter()->setMajorVersion(3);
-    m_diffuseMapGL3Technique->openGLFilter()->setMinorVersion(1);
-    m_diffuseMapGL3Technique->openGLFilter()->setProfile(QOpenGLFilter::Core);
+    m_diffuseMapGL3Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_diffuseMapGL3Technique->graphicsApiFilter()->setMajorVersion(3);
+    m_diffuseMapGL3Technique->graphicsApiFilter()->setMinorVersion(1);
+    m_diffuseMapGL3Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::CoreProfile);
 
-    m_diffuseMapGL2Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_diffuseMapGL2Technique->openGLFilter()->setMajorVersion(2);
-    m_diffuseMapGL2Technique->openGLFilter()->setMinorVersion(0);
-    m_diffuseMapGL2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_diffuseMapGL2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_diffuseMapGL2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_diffuseMapGL2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_diffuseMapGL2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
-    m_diffuseMapES2Technique->openGLFilter()->setApi(QOpenGLFilter::ES);
-    m_diffuseMapES2Technique->openGLFilter()->setMajorVersion(2);
-    m_diffuseMapES2Technique->openGLFilter()->setMinorVersion(0);
-    m_diffuseMapES2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_diffuseMapES2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGLES);
+    m_diffuseMapES2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_diffuseMapES2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_diffuseMapES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
     m_diffuseMapGL3RenderPass->setShaderProgram(m_diffuseMapGL3Shader);
     m_diffuseMapGL2RenderPass->setShaderProgram(m_diffuseMapGL2ES2Shader);
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp
index 2a1c759d9..c03664681 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp
@@ -44,7 +44,7 @@
 #include <Qt3DRender/qshaderprogram.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qrenderpass.h>
-#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qgraphicsapifilter.h>
 #include <QUrl>
 #include <QVector3D>
 #include <QVector4D>
@@ -98,20 +98,20 @@ void QDiffuseSpecularMapMaterialPrivate::init()
     m_diffuseSpecularMapGL2ES2Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/diffusespecularmap.vert"))));
     m_diffuseSpecularMapGL2ES2Shader->setFragmentShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/diffusespecularmap.frag"))));
 
-    m_diffuseSpecularMapGL3Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_diffuseSpecularMapGL3Technique->openGLFilter()->setMajorVersion(3);
-    m_diffuseSpecularMapGL3Technique->openGLFilter()->setMinorVersion(1);
-    m_diffuseSpecularMapGL3Technique->openGLFilter()->setProfile(QOpenGLFilter::Core);
+    m_diffuseSpecularMapGL3Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_diffuseSpecularMapGL3Technique->graphicsApiFilter()->setMajorVersion(3);
+    m_diffuseSpecularMapGL3Technique->graphicsApiFilter()->setMinorVersion(1);
+    m_diffuseSpecularMapGL3Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::CoreProfile);
 
-    m_diffuseSpecularMapGL2Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_diffuseSpecularMapGL2Technique->openGLFilter()->setMajorVersion(2);
-    m_diffuseSpecularMapGL2Technique->openGLFilter()->setMinorVersion(0);
-    m_diffuseSpecularMapGL2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_diffuseSpecularMapGL2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_diffuseSpecularMapGL2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_diffuseSpecularMapGL2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_diffuseSpecularMapGL2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
-    m_diffuseSpecularMapES2Technique->openGLFilter()->setApi(QOpenGLFilter::ES);
-    m_diffuseSpecularMapES2Technique->openGLFilter()->setMajorVersion(2);
-    m_diffuseSpecularMapES2Technique->openGLFilter()->setMinorVersion(0);
-    m_diffuseSpecularMapES2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_diffuseSpecularMapES2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGLES);
+    m_diffuseSpecularMapES2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_diffuseSpecularMapES2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_diffuseSpecularMapES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
     m_diffuseSpecularMapGL3RenderPass->setShaderProgram(m_diffuseSpecularMapGL3Shader);
     m_diffuseSpecularMapGL2RenderPass->setShaderProgram(m_diffuseSpecularMapGL2ES2Shader);
diff --git a/src/render/defaults/qgoochmaterial.cpp b/src/render/defaults/qgoochmaterial.cpp
index 3ab810056..30e196fc7 100644
--- a/src/render/defaults/qgoochmaterial.cpp
+++ b/src/render/defaults/qgoochmaterial.cpp
@@ -38,7 +38,7 @@
 #include "qgoochmaterial_p.h"
 
 #include <Qt3DRender/qeffect.h>
-#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qgraphicsapifilter.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qrenderpass.h>
 #include <Qt3DRender/qtechnique.h>
@@ -90,20 +90,20 @@ void QGoochMaterialPrivate::init()
     m_gl2ES2Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/gooch.vert"))));
     m_gl2ES2Shader->setFragmentShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/gooch.frag"))));
 
-    m_gl3Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_gl3Technique->openGLFilter()->setMajorVersion(3);
-    m_gl3Technique->openGLFilter()->setMinorVersion(1);
-    m_gl3Technique->openGLFilter()->setProfile(QOpenGLFilter::Core);
+    m_gl3Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_gl3Technique->graphicsApiFilter()->setMajorVersion(3);
+    m_gl3Technique->graphicsApiFilter()->setMinorVersion(1);
+    m_gl3Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::CoreProfile);
 
-    m_gl2Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_gl2Technique->openGLFilter()->setMajorVersion(2);
-    m_gl2Technique->openGLFilter()->setMinorVersion(0);
-    m_gl2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_gl2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_gl2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_gl2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_gl2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
-    m_es2Technique->openGLFilter()->setApi(QOpenGLFilter::ES);
-    m_es2Technique->openGLFilter()->setMajorVersion(2);
-    m_es2Technique->openGLFilter()->setMinorVersion(0);
-    m_es2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_es2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGLES);
+    m_es2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_es2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_es2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
     m_gl3RenderPass->setShaderProgram(m_gl3Shader);
     m_gl2RenderPass->setShaderProgram(m_gl2ES2Shader);
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
index 3971193a3..c67dc3bfe 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qshaderprogram.h>
 #include <Qt3DRender/qrenderpass.h>
-#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qgraphicsapifilter.h>
 #include <Qt3DRender/qalphacoverage.h>
 #include <Qt3DRender/qdepthtest.h>
 
@@ -74,20 +74,20 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init()
     m_normalDiffuseGL2ES2Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/normaldiffusemap.vert"))));
     m_normalDiffuseGL2ES2Shader->setFragmentShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/normaldiffusemapalpha.frag"))));
 
-    m_normalDiffuseGL3Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_normalDiffuseGL3Technique->openGLFilter()->setMajorVersion(3);
-    m_normalDiffuseGL3Technique->openGLFilter()->setMinorVersion(1);
-    m_normalDiffuseGL3Technique->openGLFilter()->setProfile(QOpenGLFilter::Core);
+    m_normalDiffuseGL3Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_normalDiffuseGL3Technique->graphicsApiFilter()->setMajorVersion(3);
+    m_normalDiffuseGL3Technique->graphicsApiFilter()->setMinorVersion(1);
+    m_normalDiffuseGL3Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::CoreProfile);
 
-    m_normalDiffuseGL2Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_normalDiffuseGL2Technique->openGLFilter()->setMajorVersion(2);
-    m_normalDiffuseGL2Technique->openGLFilter()->setMinorVersion(0);
-    m_normalDiffuseGL2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_normalDiffuseGL2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_normalDiffuseGL2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_normalDiffuseGL2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_normalDiffuseGL2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
-    m_normalDiffuseES2Technique->openGLFilter()->setApi(QOpenGLFilter::ES);
-    m_normalDiffuseES2Technique->openGLFilter()->setMajorVersion(2);
-    m_normalDiffuseES2Technique->openGLFilter()->setMinorVersion(0);
-    m_normalDiffuseES2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_normalDiffuseES2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGLES);
+    m_normalDiffuseES2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_normalDiffuseES2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_normalDiffuseES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
     m_depthTest->setFunc(QDepthTest::Less);
 
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp
index a37c9cb9e..b31337053 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qshaderprogram.h>
 #include <Qt3DRender/qrenderpass.h>
-#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qgraphicsapifilter.h>
 
 #include <QUrl>
 #include <QVector3D>
@@ -98,20 +98,20 @@ void QNormalDiffuseMapMaterialPrivate::init()
     m_normalDiffuseGL2ES2Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/normaldiffusemap.vert"))));
     m_normalDiffuseGL2ES2Shader->setFragmentShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/normaldiffusemap.frag"))));
 
-    m_normalDiffuseGL3Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_normalDiffuseGL3Technique->openGLFilter()->setMajorVersion(3);
-    m_normalDiffuseGL3Technique->openGLFilter()->setMinorVersion(1);
-    m_normalDiffuseGL3Technique->openGLFilter()->setProfile(QOpenGLFilter::Core);
+    m_normalDiffuseGL3Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_normalDiffuseGL3Technique->graphicsApiFilter()->setMajorVersion(3);
+    m_normalDiffuseGL3Technique->graphicsApiFilter()->setMinorVersion(1);
+    m_normalDiffuseGL3Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::CoreProfile);
 
-    m_normalDiffuseGL2Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_normalDiffuseGL2Technique->openGLFilter()->setMajorVersion(2);
-    m_normalDiffuseGL2Technique->openGLFilter()->setMinorVersion(0);
-    m_normalDiffuseGL2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_normalDiffuseGL2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_normalDiffuseGL2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_normalDiffuseGL2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_normalDiffuseGL2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
-    m_normalDiffuseES2Technique->openGLFilter()->setApi(QOpenGLFilter::ES);
-    m_normalDiffuseES2Technique->openGLFilter()->setMajorVersion(2);
-    m_normalDiffuseES2Technique->openGLFilter()->setMinorVersion(0);
-    m_normalDiffuseES2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_normalDiffuseES2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGLES);
+    m_normalDiffuseES2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_normalDiffuseES2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_normalDiffuseES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
     m_normalDiffuseGL3RenderPass->setShaderProgram(m_normalDiffuseGL3Shader);
     m_normalDiffuseGL2RenderPass->setShaderProgram(m_normalDiffuseGL2ES2Shader);
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
index 17e7c4e6d..420f22a7d 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DRender/qshaderprogram.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qrenderpass.h>
-#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qgraphicsapifilter.h>
 #include <QUrl>
 #include <QVector3D>
 #include <QVector4D>
@@ -104,20 +104,20 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init()
     m_normalDiffuseSpecularGL2ES2Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/normaldiffusespecularmap.vert"))));
     m_normalDiffuseSpecularGL2ES2Shader->setFragmentShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/normaldiffusespecularmap.frag"))));
 
-    m_normalDiffuseSpecularGL3Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_normalDiffuseSpecularGL3Technique->openGLFilter()->setMajorVersion(3);
-    m_normalDiffuseSpecularGL3Technique->openGLFilter()->setMinorVersion(1);
-    m_normalDiffuseSpecularGL3Technique->openGLFilter()->setProfile(QOpenGLFilter::Core);
+    m_normalDiffuseSpecularGL3Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_normalDiffuseSpecularGL3Technique->graphicsApiFilter()->setMajorVersion(3);
+    m_normalDiffuseSpecularGL3Technique->graphicsApiFilter()->setMinorVersion(1);
+    m_normalDiffuseSpecularGL3Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::CoreProfile);
 
-    m_normalDiffuseSpecularGL2Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_normalDiffuseSpecularGL2Technique->openGLFilter()->setMajorVersion(2);
-    m_normalDiffuseSpecularGL2Technique->openGLFilter()->setMinorVersion(0);
-    m_normalDiffuseSpecularGL2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_normalDiffuseSpecularGL2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_normalDiffuseSpecularGL2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_normalDiffuseSpecularGL2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_normalDiffuseSpecularGL2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
-    m_normalDiffuseSpecularES2Technique->openGLFilter()->setApi(QOpenGLFilter::ES);
-    m_normalDiffuseSpecularES2Technique->openGLFilter()->setMajorVersion(2);
-    m_normalDiffuseSpecularES2Technique->openGLFilter()->setMinorVersion(0);
-    m_normalDiffuseSpecularES2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_normalDiffuseSpecularES2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGLES);
+    m_normalDiffuseSpecularES2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_normalDiffuseSpecularES2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_normalDiffuseSpecularES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
     m_normalDiffuseSpecularGL3RenderPass->setShaderProgram(m_normalDiffuseSpecularGL3Shader);
     m_normalDiffuseSpecularGL2RenderPass->setShaderProgram(m_normalDiffuseSpecularGL2ES2Shader);
diff --git a/src/render/defaults/qpervertexcolormaterial.cpp b/src/render/defaults/qpervertexcolormaterial.cpp
index c80013e5e..27f7de224 100644
--- a/src/render/defaults/qpervertexcolormaterial.cpp
+++ b/src/render/defaults/qpervertexcolormaterial.cpp
@@ -42,7 +42,7 @@
 #include <Qt3DRender/qshaderprogram.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qrenderpass.h>
-#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qgraphicsapifilter.h>
 #include <QUrl>
 #include <QVector3D>
 #include <QVector4D>
@@ -118,20 +118,20 @@ void QPerVertexColorMaterialPrivate::init()
     m_vertexGL2ES2Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/pervertexcolor.vert"))));
     m_vertexGL2ES2Shader->setFragmentShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/pervertexcolor.frag"))));
 
-    m_vertexGL3Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_vertexGL3Technique->openGLFilter()->setMajorVersion(3);
-    m_vertexGL3Technique->openGLFilter()->setMinorVersion(1);
-    m_vertexGL3Technique->openGLFilter()->setProfile(QOpenGLFilter::Core);
+    m_vertexGL3Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_vertexGL3Technique->graphicsApiFilter()->setMajorVersion(3);
+    m_vertexGL3Technique->graphicsApiFilter()->setMinorVersion(1);
+    m_vertexGL3Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::CoreProfile);
 
-    m_vertexGL2Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_vertexGL2Technique->openGLFilter()->setMajorVersion(2);
-    m_vertexGL2Technique->openGLFilter()->setMinorVersion(0);
-    m_vertexGL2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_vertexGL2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_vertexGL2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_vertexGL2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_vertexGL2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
-    m_vertexES2Technique->openGLFilter()->setApi(QOpenGLFilter::ES);
-    m_vertexES2Technique->openGLFilter()->setMajorVersion(2);
-    m_vertexES2Technique->openGLFilter()->setMinorVersion(0);
-    m_vertexES2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_vertexES2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGLES);
+    m_vertexES2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_vertexES2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_vertexES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
     m_vertexGL3RenderPass->setShaderProgram(m_vertexGL3Shader);
     m_vertexGL2RenderPass->setShaderProgram(m_vertexGL2ES2Shader);
diff --git a/src/render/defaults/qphongmaterial.cpp b/src/render/defaults/qphongmaterial.cpp
index aaa8e338a..2a4663f27 100644
--- a/src/render/defaults/qphongmaterial.cpp
+++ b/src/render/defaults/qphongmaterial.cpp
@@ -42,7 +42,7 @@
 #include <Qt3DRender/qshaderprogram.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qrenderpass.h>
-#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qgraphicsapifilter.h>
 #include <QUrl>
 #include <QVector3D>
 #include <QVector4D>
@@ -196,20 +196,20 @@ void QPhongMaterialPrivate::init()
     m_phongGL2ES2Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/phong.vert"))));
     m_phongGL2ES2Shader->setFragmentShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/phong.frag"))));
 
-    m_phongGL3Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_phongGL3Technique->openGLFilter()->setMajorVersion(3);
-    m_phongGL3Technique->openGLFilter()->setMinorVersion(1);
-    m_phongGL3Technique->openGLFilter()->setProfile(QOpenGLFilter::Core);
+    m_phongGL3Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_phongGL3Technique->graphicsApiFilter()->setMajorVersion(3);
+    m_phongGL3Technique->graphicsApiFilter()->setMinorVersion(1);
+    m_phongGL3Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::CoreProfile);
 
-    m_phongGL2Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_phongGL2Technique->openGLFilter()->setMajorVersion(2);
-    m_phongGL2Technique->openGLFilter()->setMinorVersion(0);
-    m_phongGL2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_phongGL2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_phongGL2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_phongGL2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_phongGL2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
-    m_phongES2Technique->openGLFilter()->setApi(QOpenGLFilter::ES);
-    m_phongES2Technique->openGLFilter()->setMajorVersion(2);
-    m_phongES2Technique->openGLFilter()->setMinorVersion(0);
-    m_phongES2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_phongES2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGLES);
+    m_phongES2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_phongES2Technique->graphicsApiFilter()->setMinorVersion(0);
+    m_phongES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
     m_phongGL3RenderPass->setShaderProgram(m_phongGL3Shader);
     m_phongGL2RenderPass->setShaderProgram(m_phongGL2ES2Shader);
diff --git a/src/render/defaults/qskyboxentity.cpp b/src/render/defaults/qskyboxentity.cpp
index 387646b61..8c9169f42 100644
--- a/src/render/defaults/qskyboxentity.cpp
+++ b/src/render/defaults/qskyboxentity.cpp
@@ -47,7 +47,7 @@
 #include <Qt3DRender/qtechnique.h>
 #include <Qt3DRender/qcuboidmesh.h>
 #include <Qt3DRender/qrenderpass.h>
-#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qgraphicsapifilter.h>
 #include <Qt3DRender/qshaderprogram.h>
 #include <Qt3DCore/qtranslatetransform.h>
 
@@ -98,20 +98,20 @@ void QSkyboxEntityPrivate::init()
     m_gl2es2Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/skybox.vert"))));
     m_gl2es2Shader->setFragmentShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/skybox.frag"))));
 
-    m_gl3Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_gl3Technique->openGLFilter()->setMajorVersion(3);
-    m_gl3Technique->openGLFilter()->setMajorVersion(1);
-    m_gl3Technique->openGLFilter()->setProfile(QOpenGLFilter::Core);
+    m_gl3Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_gl3Technique->graphicsApiFilter()->setMajorVersion(3);
+    m_gl3Technique->graphicsApiFilter()->setMajorVersion(1);
+    m_gl3Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::CoreProfile);
 
-    m_gl2Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop);
-    m_gl2Technique->openGLFilter()->setMajorVersion(2);
-    m_gl2Technique->openGLFilter()->setMajorVersion(0);
-    m_gl2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_gl2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
+    m_gl2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_gl2Technique->graphicsApiFilter()->setMajorVersion(0);
+    m_gl2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
-    m_es2Technique->openGLFilter()->setApi(QOpenGLFilter::ES);
-    m_es2Technique->openGLFilter()->setMajorVersion(2);
-    m_es2Technique->openGLFilter()->setMajorVersion(0);
-    m_es2Technique->openGLFilter()->setProfile(QOpenGLFilter::None);
+    m_es2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGLES);
+    m_es2Technique->graphicsApiFilter()->setMajorVersion(2);
+    m_es2Technique->graphicsApiFilter()->setMajorVersion(0);
+    m_es2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
     m_gl3RenderPass->setShaderProgram(m_gl3Shader);
     m_gl2RenderPass->setShaderProgram(m_gl2es2Shader);
diff --git a/src/render/graphicshelpers/graphicscontext.cpp b/src/render/graphicshelpers/graphicscontext.cpp
index 626e34e3b..7972e85e3 100644
--- a/src/render/graphicshelpers/graphicscontext.cpp
+++ b/src/render/graphicshelpers/graphicscontext.cpp
@@ -37,7 +37,7 @@
 
 #include "graphicscontext_p.h"
 
-#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qgraphicsapifilter.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/private/renderlogging_p.h>
 #include <Qt3DRender/private/shader_p.h>
@@ -131,7 +131,7 @@ GraphicsContext::GraphicsContext()
     , m_defaultFBO(0)
     , m_stateSet(Q_NULLPTR)
     , m_renderer(Q_NULLPTR)
-    , m_contextInfo(new QOpenGLFilter())
+    , m_contextInfo(new QGraphicsApiFilter())
     , m_uboTempArray(QByteArray(1024, 0))
     , m_supportsVAO(true)
 {
@@ -562,14 +562,14 @@ void GraphicsContext::resolveHighestOpenGLFunctions()
     }
 #endif
 
-    // Set Vendor and Extensions of reference OpenGLFilter
+    // Set Vendor and Extensions of reference GraphicsApiFilter
     QStringList extensions;
     Q_FOREACH (const QByteArray &ext, m_gl->extensions().values())
         extensions << QString::fromUtf8(ext);
     m_contextInfo->setMajorVersion(m_gl->format().version().first);
     m_contextInfo->setMinorVersion(m_gl->format().version().second);
-    m_contextInfo->setApi(m_gl->isOpenGLES() ? QOpenGLFilter::ES : QOpenGLFilter::Desktop);
-    m_contextInfo->setProfile(static_cast<QOpenGLFilter::Profile>(m_gl->format().profile()));
+    m_contextInfo->setApi(m_gl->isOpenGLES() ? QGraphicsApiFilter::OpenGLES : QGraphicsApiFilter::OpenGL);
+    m_contextInfo->setProfile(static_cast<QGraphicsApiFilter::Profile>(m_gl->format().profile()));
     m_contextInfo->setExtensions(extensions);
     m_contextInfo->setVendor(QString::fromUtf8(reinterpret_cast<const char *>(m_gl->functions()->glGetString(GL_VENDOR))));
 }
@@ -601,7 +601,7 @@ RenderStateSet *GraphicsContext::currentStateSet() const
     return m_stateSet;
 }
 
-QOpenGLFilter *GraphicsContext::contextInfo() const
+QGraphicsApiFilter *GraphicsContext::contextInfo() const
 {
     return m_contextInfo;
 }
diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h
index ab7d061b1..cf34806b7 100644
--- a/src/render/graphicshelpers/graphicscontext_p.h
+++ b/src/render/graphicshelpers/graphicscontext_p.h
@@ -69,7 +69,7 @@ class QAbstractOpenGLFunctions;
 
 namespace Qt3DRender {
 
-class QOpenGLFilter;
+class QGraphicsApiFilter;
 
 namespace Render {
 
@@ -166,7 +166,7 @@ public:
 
     void setCurrentStateSet(RenderStateSet* ss);
     RenderStateSet *currentStateSet() const;
-    QOpenGLFilter *contextInfo() const;
+    QGraphicsApiFilter *contextInfo() const;
 
     // Wrapper methods
     void    drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void * indices, GLsizei instances, GLint baseVertex = 0, GLint baseInstance = 0);
@@ -247,7 +247,7 @@ private:
     RenderStateSet* m_stateSet;
 
     Renderer *m_renderer;
-    QOpenGLFilter *m_contextInfo;
+    QGraphicsApiFilter *m_contextInfo;
 
     QByteArray m_uboTempArray;
 
diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp
index 8338161b1..6a089f1fd 100644
--- a/src/render/jobs/renderviewjobutils.cpp
+++ b/src/render/jobs/renderviewjobutils.cpp
@@ -37,7 +37,7 @@
 #include "renderviewjobutils_p.h"
 #include "renderlogging_p.h"
 
-#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qgraphicsapifilter.h>
 #include <Qt3DRender/private/sphere_p.h>
 #include <Qt3DRender/qshaderdata.h>
 
@@ -230,7 +230,7 @@ Technique *findTechniqueForEffect(Renderer *renderer,
             continue;
 
         // We need to be sure the renderer is still running <=> still has a GraphicsContext
-        if (renderer->isRunning() && *renderer->contextInfo() == *technique->openGLFilter()) {
+        if (renderer->isRunning() && *renderer->contextInfo() == *technique->graphicsApiFilter()) {
 
             // If no techniqueFilter is present, we return the technique as it satisfies OpenGL version
             const TechniqueFilter *techniqueFilter = renderView->techniqueFilter();
diff --git a/src/render/materialsystem/materialsystem.pri b/src/render/materialsystem/materialsystem.pri
index a52d2297f..53f7e94f7 100644
--- a/src/render/materialsystem/materialsystem.pri
+++ b/src/render/materialsystem/materialsystem.pri
@@ -12,7 +12,6 @@ HEADERS += \
     $$PWD/qeffect_p.h \
     $$PWD/qmaterial.h \
     $$PWD/qmaterial_p.h \
-    $$PWD/qopenglfilter.h \
     $$PWD/qparameter.h \
     $$PWD/qparameter_p.h \
     $$PWD/qparametermapping.h \
@@ -28,7 +27,8 @@ HEADERS += \
     $$PWD/renderpass_p.h \
     $$PWD/shader_p.h \
     $$PWD/shaderdata_p.h \
-    $$PWD/technique_p.h
+    $$PWD/technique_p.h \
+    $$PWD/qgraphicsapifilter.h
 
 SOURCES += \
     $$PWD/annotation.cpp \
@@ -39,7 +39,6 @@ SOURCES += \
     $$PWD/qannotation.cpp \
     $$PWD/qeffect.cpp \
     $$PWD/qmaterial.cpp \
-    $$PWD/qopenglfilter.cpp \
     $$PWD/qparameter.cpp \
     $$PWD/qparametermapping.cpp \
     $$PWD/qrenderpass.cpp \
@@ -49,4 +48,5 @@ SOURCES += \
     $$PWD/renderpass.cpp \
     $$PWD/shader.cpp \
     $$PWD/shaderdata.cpp \
-    $$PWD/technique.cpp
+    $$PWD/technique.cpp \
+    $$PWD/qgraphicsapifilter.cpp
diff --git a/src/render/materialsystem/qopenglfilter.cpp b/src/render/materialsystem/qgraphicsapifilter.cpp
index e334ca88e..21f5468f0 100644
--- a/src/render/materialsystem/qopenglfilter.cpp
+++ b/src/render/materialsystem/qgraphicsapifilter.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qopenglfilter.h"
+#include "qgraphicsapifilter.h"
 #include "private/qobject_p.h"
 #include <QOpenGLContext>
 
@@ -42,21 +42,21 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QOpenGLFilterPrivate : public QObjectPrivate
+class QGraphicsApiFilterPrivate : public QObjectPrivate
 {
 public:
-    QOpenGLFilterPrivate()
+    QGraphicsApiFilterPrivate()
         : QObjectPrivate()
-        , m_api(QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL ? QOpenGLFilter::Desktop : QOpenGLFilter::ES)
-        , m_profile(QOpenGLFilter::None) // matches all (no profile, core, compat)
+        , m_api(QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL ? QGraphicsApiFilter::OpenGL : QGraphicsApiFilter::OpenGLES)
+        , m_profile(QGraphicsApiFilter::NoProfile) // matches all (no profile, core, compat)
         , m_minor(0)
         , m_major(0)
     {
     }
 
-    Q_DECLARE_PUBLIC(QOpenGLFilter)
-    QOpenGLFilter::Api m_api;
-    QOpenGLFilter::Profile m_profile;
+    Q_DECLARE_PUBLIC(QGraphicsApiFilter)
+    QGraphicsApiFilter::Api m_api;
+    QGraphicsApiFilter::Profile m_profile;
     int m_minor;
     int m_major;
     QStringList m_extensions;
@@ -64,35 +64,35 @@ public:
 };
 
 /*!
-    \class Qt3DRender::QOpenGLFilter
-    \inmodule Qt3DRenderer
+    \class Qt3DRender::QGraphicsApiFilter
+    \inmodule Qt3DRender
     \since 5.5
-    \brief The QOpenGLFilter class provides ...
+    \brief The QGraphicsApiFilter class provides ...
 */
 
 /*!
-    \qmltype OpenGLFilter
-    \instantiates Qt3DRender::QOpenGLFilter
+    \qmltype GraphicsApiFilter
+    \instantiates Qt3DRender::QGraphicsApiFilter
     \inherits QtObject
     \inqmlmodule Qt3D.Render
     \since 5.5
     \brief For OpenGL ...
 */
 
-/*! \fn Qt3DRender::QOpenGLFilter::QOpenGLFilter(QObject *parent)
-  Constructs a new QOpenGLFilter with the specified \a parent.
+/*! \fn Qt3DRender::QGraphicsApiFilter::QGraphicsApiFilter(QObject *parent)
+  Constructs a new QGraphicsApiFilter with the specified \a parent.
  */
-QOpenGLFilter::QOpenGLFilter(QObject *parent)
-    : QObject(*new QOpenGLFilterPrivate, parent)
+QGraphicsApiFilter::QGraphicsApiFilter(QObject *parent)
+    : QObject(*new QGraphicsApiFilterPrivate, parent)
 {
 }
 
-/*! \fn void Qt3DRender::QOpenGLFilter::copy(const QOpenGLFilter &ref)
+/*! \fn void Qt3DRender::QGraphicsApiFilter::copy(const QGraphicsApiFilter &ref)
   Copies the \a ref instance into this one.
  */
-void QOpenGLFilter::copy(const QOpenGLFilter &ref)
+void QGraphicsApiFilter::copy(const QGraphicsApiFilter &ref)
 {
-    Q_D(QOpenGLFilter);
+    Q_D(QGraphicsApiFilter);
     d->m_api = ref.api();
     d->m_profile = ref.profile();
     d->m_major = ref.majorVersion();
@@ -102,189 +102,189 @@ void QOpenGLFilter::copy(const QOpenGLFilter &ref)
 }
 
 /*!
-  \enum Qt3DRender::QOpenGLFilter::Api
+  \enum Qt3DRender::QGraphicsApiFilter::Api
 
-  \value ES QSurfaceFormat::OpenGLES
-  \value Desktop QSurfaceFormat::OpenGL
+  \value OpenGLES QSurfaceFormat::OpenGLES
+  \value OpenGL QSurfaceFormat::OpenGL
 
 */
 
 /*!
-  \enum Qt3DRender::QOpenGLFilter::Profile
+  \enum Qt3DRender::QGraphicsApiFilter::Profile
 
-  \value None QSurfaceFormat::NoProfile
-  \value Core QSurfaceFormat::CoreProfile
-  \value Compatibility QSurfaceFormat::CompatibilityProfile
+  \value NoProfile QSurfaceFormat::NoProfile
+  \value CoreProfile QSurfaceFormat::CoreProfile
+  \value CompatibilityProfile QSurfaceFormat::CompatibilityProfile
 
 */
 
 /*!
-  \property Qt3DRender::QOpenGLFilter::api
+  \property Qt3DRender::QGraphicsApiFilter::api
 
 */
 
 /*!
-  \qmlproperty enumeration Qt3D.Renderer::OpenGLFilter::api
+  \qmlproperty enumeration Qt3D.Render::GraphicsApiFilter::api
 
 
-  \value ES QSurfaceFormat::OpenGLES
-  \value Desktop QSurfaceFormat::OpenGL
+  \value OpenGLES QSurfaceFormat::OpenGLES
+  \value OpenGL QSurfaceFormat::OpenGL
 */
 
-QOpenGLFilter::Api QOpenGLFilter::api() const
+QGraphicsApiFilter::Api QGraphicsApiFilter::api() const
 {
-    Q_D(const QOpenGLFilter);
+    Q_D(const QGraphicsApiFilter);
     return d->m_api;
 }
 
 /*!
-  \property Qt3DRender::QOpenGLFilter::profile
+  \property Qt3DRender::QGraphicsApiFilter::profile
 
 */
 
 /*!
-  \qmlproperty enumeration Qt3D.Renderer::OpenGLFilter::profile
+  \qmlproperty enumeration Qt3D.Render::GraphicsApiFilter::profile
 
-  \value None QSurfaceFormat::NoProfile
-  \value Core QSurfaceFormat::CoreProfile
-  \value Compatibility QSurfaceFormat::CompatibilityProfile
+  \value NoProfile QSurfaceFormat::NoProfile
+  \value CoreProfile QSurfaceFormat::CoreProfile
+  \value CompatibilityProfile QSurfaceFormat::CompatibilityProfile
 */
 
-QOpenGLFilter::Profile QOpenGLFilter::profile() const
+QGraphicsApiFilter::Profile QGraphicsApiFilter::profile() const
 {
-    Q_D(const QOpenGLFilter);
+    Q_D(const QGraphicsApiFilter);
     return d->m_profile;
 }
 
 /*!
-  \property Qt3DRender::QOpenGLFilter::minorVersion
+  \property Qt3DRender::QGraphicsApiFilter::minorVersion
 
  */
 
 /*!
-  \qmlproperty int Qt3D.Renderer::OpenGLFilter::minorVersion
+  \qmlproperty int Qt3D.Render::GraphicsApiFilter::minorVersion
 
 */
 
-int QOpenGLFilter::minorVersion() const
+int QGraphicsApiFilter::minorVersion() const
 {
-    Q_D(const QOpenGLFilter);
+    Q_D(const QGraphicsApiFilter);
     return d->m_minor;
 }
 
 /*!
-  \property Qt3DRender::QOpenGLFilter::majorVersion
+  \property Qt3DRender::QGraphicsApiFilter::majorVersion
 
  */
 
 /*!
-  \qmlproperty int Qt3D.Renderer::OpenGLFilter::majorVersion
+  \qmlproperty int Qt3D.Render::GraphicsApiFilter::majorVersion
 
 */
 
-int QOpenGLFilter::majorVersion() const
+int QGraphicsApiFilter::majorVersion() const
 {
-    Q_D(const QOpenGLFilter);
+    Q_D(const QGraphicsApiFilter);
     return d->m_major;
 }
 
 /*!
-  \property Qt3DRender::QOpenGLFilter::extensions
+  \property Qt3DRender::QGraphicsApiFilter::extensions
 
  */
 
 /*!
-  \qmlproperty stringlist Qt3D.Renderer::OpenGLFilter::extensions
+  \qmlproperty stringlist Qt3D.Render::GraphicsApiFilter::extensions
 
 */
 
-QStringList QOpenGLFilter::extensions() const
+QStringList QGraphicsApiFilter::extensions() const
 {
-    Q_D(const QOpenGLFilter);
+    Q_D(const QGraphicsApiFilter);
     return d->m_extensions;
 }
 
 /*!
-  \property Qt3DRender::QOpenGLFilter::vendor
+  \property Qt3DRender::QGraphicsApiFilter::vendor
 
  */
 
 /*!
-  \qmlproperty string Qt3D.Renderer::OpenGLFilter::vendor
+  \qmlproperty string Qt3D.Render::GraphicsApiFilter::vendor
 
 */
 
-QString QOpenGLFilter::vendor() const
+QString QGraphicsApiFilter::vendor() const
 {
-    Q_D(const QOpenGLFilter);
+    Q_D(const QGraphicsApiFilter);
     return d->m_vendor;
 }
 
-void QOpenGLFilter::setApi(QOpenGLFilter::Api api)
+void QGraphicsApiFilter::setApi(QGraphicsApiFilter::Api api)
 {
-    Q_D(QOpenGLFilter);
+    Q_D(QGraphicsApiFilter);
     if (d->m_api != api) {
         d->m_api = api;
         emit apiChanged();
-        emit openGLFilterChanged();
+        emit graphicsApiFilterChanged();
     }
 }
 
-void QOpenGLFilter::setProfile(QOpenGLFilter::Profile profile)
+void QGraphicsApiFilter::setProfile(QGraphicsApiFilter::Profile profile)
 {
-    Q_D(QOpenGLFilter);
+    Q_D(QGraphicsApiFilter);
     if (d->m_profile != profile) {
         d->m_profile = profile;
         emit profileChanged();
-        emit openGLFilterChanged();
+        emit graphicsApiFilterChanged();
     }
 }
 
-void QOpenGLFilter::setMinorVersion(int minorVersion)
+void QGraphicsApiFilter::setMinorVersion(int minorVersion)
 {
-    Q_D(QOpenGLFilter);
+    Q_D(QGraphicsApiFilter);
     if (minorVersion != d->m_minor) {
         d->m_minor = minorVersion;
         emit minorVersionChanged();
-        emit openGLFilterChanged();
+        emit graphicsApiFilterChanged();
     }
 }
 
-void QOpenGLFilter::setMajorVersion(int majorVersion)
+void QGraphicsApiFilter::setMajorVersion(int majorVersion)
 {
-    Q_D(QOpenGLFilter);
+    Q_D(QGraphicsApiFilter);
     if (d->m_major != majorVersion) {
         d->m_major = majorVersion;
         emit majorVersionChanged();
-        emit openGLFilterChanged();
+        emit graphicsApiFilterChanged();
     }
 }
 
-void QOpenGLFilter::setExtensions(const QStringList &extensions)
+void QGraphicsApiFilter::setExtensions(const QStringList &extensions)
 {
-    Q_D(QOpenGLFilter);
+    Q_D(QGraphicsApiFilter);
     if (d->m_extensions != extensions) {
         d->m_extensions = extensions;
         emit extensionsChanged();
-        emit openGLFilterChanged();
+        emit graphicsApiFilterChanged();
     }
 }
 
-void QOpenGLFilter::setVendor(const QString &vendor)
+void QGraphicsApiFilter::setVendor(const QString &vendor)
 {
-    Q_D(QOpenGLFilter);
+    Q_D(QGraphicsApiFilter);
     if (d->m_vendor != vendor) {
         d->m_vendor = vendor;
         emit vendorChanged();
-        emit openGLFilterChanged();
+        emit graphicsApiFilterChanged();
     }
 }
 
-/*! \fn bool Qt3DCore::operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
-  \relates Qt3DRender::QOpenGLFilter
+/*! \fn bool Qt3DCore::operator ==(const QGraphicsApiFilter &reference, const QGraphicsApiFilter &sample)
+  \relates Qt3DRender::QGraphicsApiFilter
   Returns true if \a reference and \a sample are equivalent.
  */
-bool operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
+bool operator ==(const QGraphicsApiFilter &reference, const QGraphicsApiFilter &sample)
 {
     if (sample.api() == reference.api()
         && sample.profile() <= reference.profile()
@@ -302,16 +302,16 @@ bool operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
     return false;
 }
 
-/*! \fn bool Qt3DCore::operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
-  \relates Qt3DRender::QOpenGLFilter
+/*! \fn bool Qt3DCore::operator !=(const QGraphicsApiFilter &reference, const QGraphicsApiFilter &sample)
+  \relates Qt3DRender::QGraphicsApiFilter
   Returns true if \a reference and \a sample are different.
  */
-bool operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
+bool operator !=(const QGraphicsApiFilter &reference, const QGraphicsApiFilter &sample)
 {
     return !(reference == sample);
 }
 
-/*! \fn void Qt3DRender::QOpenGLFilter::openGLFilterChanged()
+/*! \fn void Qt3DRender::QGraphicsApiFilter::graphicsApiFilterChanged()
   This signal is emitted when the value of any property is changed.
 */
 } // namespace Qt3DRender
diff --git a/src/render/materialsystem/qopenglfilter.h b/src/render/materialsystem/qgraphicsapifilter.h
index a7d46b285..31a176532 100644
--- a/src/render/materialsystem/qopenglfilter.h
+++ b/src/render/materialsystem/qgraphicsapifilter.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_QOPENGLFILTER_H
-#define QT3DRENDER_QOPENGLFILTER_H
+#ifndef QT3DRENDER_QGRAPHICSAPIFILTER_H
+#define QT3DRENDER_QGRAPHICSAPIFILTER_H
 
 #include <QObject>
 #include <QStringList>
@@ -46,13 +46,13 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QOpenGLFilterPrivate;
+class QGraphicsApiFilterPrivate;
 
-class QT3DRENDERSHARED_EXPORT QOpenGLFilter : public QObject
+class QT3DRENDERSHARED_EXPORT QGraphicsApiFilter : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3DRender::QOpenGLFilter::Api api READ api WRITE setApi NOTIFY apiChanged)
-    Q_PROPERTY(Qt3DRender::QOpenGLFilter::Profile profile READ profile WRITE setProfile NOTIFY profileChanged)
+    Q_PROPERTY(Qt3DRender::QGraphicsApiFilter::Api api READ api WRITE setApi NOTIFY apiChanged)
+    Q_PROPERTY(Qt3DRender::QGraphicsApiFilter::Profile profile READ profile WRITE setProfile NOTIFY profileChanged)
     Q_PROPERTY(int minorVersion READ minorVersion WRITE setMinorVersion NOTIFY minorVersionChanged)
     Q_PROPERTY(int majorVersion READ majorVersion WRITE setMajorVersion NOTIFY majorVersionChanged)
     Q_PROPERTY(QStringList extensions READ extensions WRITE setExtensions NOTIFY extensionsChanged)
@@ -62,22 +62,22 @@ public:
 
     enum Api
     {
-        ES = QSurfaceFormat::OpenGLES,
-        Desktop = QSurfaceFormat::OpenGL
+        OpenGLES = QSurfaceFormat::OpenGLES,
+        OpenGL = QSurfaceFormat::OpenGL
     };
     Q_ENUM(Api)
 
     enum Profile
     {
-        None = QSurfaceFormat::NoProfile,
-        Core = QSurfaceFormat::CoreProfile,
-        Compatibility = QSurfaceFormat::CompatibilityProfile
+        NoProfile = QSurfaceFormat::NoProfile,
+        CoreProfile = QSurfaceFormat::CoreProfile,
+        CompatibilityProfile = QSurfaceFormat::CompatibilityProfile
     };
     Q_ENUM(Profile)
 
-    explicit QOpenGLFilter(QObject *parent = 0);
+    explicit QGraphicsApiFilter(QObject *parent = 0);
 
-    void copy(const QOpenGLFilter &ref);
+    void copy(const QGraphicsApiFilter &ref);
 
     Api api() const;
     Profile profile() const;
@@ -100,17 +100,17 @@ Q_SIGNALS:
     void majorVersionChanged();
     void extensionsChanged();
     void vendorChanged();
-    void openGLFilterChanged();
+    void graphicsApiFilterChanged();
 
 private:
-    Q_DECLARE_PRIVATE(QOpenGLFilter)
+    Q_DECLARE_PRIVATE(QGraphicsApiFilter)
 };
 
-bool operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample);
-bool operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample);
+bool operator ==(const QGraphicsApiFilter &reference, const QGraphicsApiFilter &sample);
+bool operator !=(const QGraphicsApiFilter &reference, const QGraphicsApiFilter &sample);
 
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_QOPENGLFILTER_H
+#endif // QT3DRENDER_QGRAPHICSAPIFILTER_H
diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp
index e80811603..7d34f49d2 100644
--- a/src/render/materialsystem/qtechnique.cpp
+++ b/src/render/materialsystem/qtechnique.cpp
@@ -37,7 +37,7 @@
 #include "qtechnique.h"
 #include "qtechnique_p.h"
 #include "qparameter.h"
-#include "qopenglfilter.h"
+#include "qgraphicsapifilter.h"
 #include <Qt3DCore/qscenepropertychange.h>
 #include <QDebug>
 
@@ -64,7 +64,7 @@ QTechnique::QTechnique(QNode *parent)
     : QNode(*new QTechniquePrivate, parent)
 {
     Q_D(QTechnique);
-    QObject::connect(&d->m_openGLFilter, SIGNAL(openGLFilterChanged()), this, SLOT(_q_openGLFilterChanged()));
+    QObject::connect(&d->m_graphicsApiFilter, SIGNAL(graphicsApiFilterChanged()), this, SLOT(_q_graphicsApiFilterChanged()));
 }
 
 QTechnique::~QTechnique()
@@ -77,14 +77,14 @@ QTechnique::QTechnique(QTechniquePrivate &dd, QNode *parent)
     : QNode(dd, parent)
 {
     Q_D(QTechnique);
-    QObject::connect(&d->m_openGLFilter, SIGNAL(openGLFilterChanged()), this, SLOT(_q_openGLFilterChanged()));
+    QObject::connect(&d->m_graphicsApiFilter, SIGNAL(graphicsApiFilterChanged()), this, SLOT(_q_graphicsApiFilterChanged()));
 }
 
 void QTechnique::copy(const QNode *ref)
 {
     QNode::copy(ref);
     const QTechnique *tech = static_cast<const QTechnique*>(ref);
-    d_func()->m_openGLFilter.copy(tech->d_func()->m_openGLFilter);
+    d_func()->m_graphicsApiFilter.copy(tech->d_func()->m_graphicsApiFilter);
 
     Q_FOREACH (QAnnotation *annotation, tech->d_func()->m_annotationList)
         addAnnotation(qobject_cast<QAnnotation *>(QNode::clone(annotation)));
@@ -94,13 +94,13 @@ void QTechnique::copy(const QNode *ref)
         addParameter(qobject_cast<QParameter *>(QNode::clone(p)));
 }
 
-void QTechniquePrivate::_q_openGLFilterChanged()
+void QTechniquePrivate::_q_graphicsApiFilterChanged()
 {
     if (m_changeArbiter != Q_NULLPTR) {
         QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, m_id));
-        change->setPropertyName("openGLFilter");
-        QOpenGLFilter *clone = new QOpenGLFilter();
-        clone->copy(m_openGLFilter);
+        change->setPropertyName("graphicsApiFilter");
+        QGraphicsApiFilter *clone = new QGraphicsApiFilter();
+        clone->copy(m_graphicsApiFilter);
         change->setValue(QVariant::fromValue(clone));
         notifyObservers(change);
     }
@@ -240,10 +240,10 @@ QList<QParameter *> QTechnique::parameters() const
     return d->m_parameters;
 }
 
-QOpenGLFilter *QTechnique::openGLFilter()
+QGraphicsApiFilter *QTechnique::graphicsApiFilter()
 {
     Q_D(QTechnique);
-    return &d->m_openGLFilter;
+    return &d->m_graphicsApiFilter;
 }
 
 } // of namespace Qt3DRender
diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h
index 7e28f313b..1a7bed492 100644
--- a/src/render/materialsystem/qtechnique.h
+++ b/src/render/materialsystem/qtechnique.h
@@ -50,12 +50,12 @@ namespace Qt3DRender {
 
 class QParameter;
 class QTechniquePrivate;
-class QOpenGLFilter;
+class QGraphicsApiFilter;
 
 class QT3DRENDERSHARED_EXPORT QTechnique : public Qt3DCore::QNode
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3DRender::QOpenGLFilter *openGLFilter READ openGLFilter)
+    Q_PROPERTY(Qt3DRender::QGraphicsApiFilter *graphicsApiFilter READ graphicsApiFilter)
 
 public:
     explicit QTechnique(Qt3DCore::QNode *parent = 0);
@@ -73,7 +73,7 @@ public:
     void removePass(QRenderPass *pass);
     QList<QRenderPass *> renderPasses() const;
 
-    QOpenGLFilter *openGLFilter();
+    QGraphicsApiFilter *graphicsApiFilter();
 
 protected:
     QTechnique(QTechniquePrivate &dd, Qt3DCore::QNode *parent = 0);
@@ -82,7 +82,7 @@ protected:
 private:
     Q_DECLARE_PRIVATE(QTechnique)
     QT3D_CLONEABLE(QTechnique)
-    Q_PRIVATE_SLOT(d_func(), void _q_openGLFilterChanged())
+    Q_PRIVATE_SLOT(d_func(), void _q_graphicsApiFilterChanged())
 };
 
 }
diff --git a/src/render/materialsystem/qtechnique_p.h b/src/render/materialsystem/qtechnique_p.h
index 7ea92cad0..25080bacb 100644
--- a/src/render/materialsystem/qtechnique_p.h
+++ b/src/render/materialsystem/qtechnique_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <private/qnode_p.h>
-#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qgraphicsapifilter.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -70,10 +70,10 @@ public:
     QList<QAnnotation *> m_annotationList;
     QList<QParameter *> m_parameters;
     QList<QRenderPass*> m_renderPasses;
-    QOpenGLFilter m_openGLFilter;
+    QGraphicsApiFilter m_graphicsApiFilter;
 
 private:
-    void _q_openGLFilterChanged();
+    void _q_graphicsApiFilterChanged();
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp
index 29f4c3f19..1fe4e8a8f 100644
--- a/src/render/materialsystem/technique.cpp
+++ b/src/render/materialsystem/technique.cpp
@@ -39,7 +39,7 @@
 #include <Qt3DRender/qrenderpass.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qtechnique.h>
-#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qgraphicsapifilter.h>
 #include <Qt3DRender/private/renderer_p.h>
 #include <Qt3DRender/private/annotation_p.h>
 #include <Qt3DRender/private/shader_p.h>
@@ -57,14 +57,14 @@ namespace Render {
 
 Technique::Technique()
     : QBackendNode()
-    , m_openglFilter(new QOpenGLFilter())
+    , m_graphicsApiFilter(new QGraphicsApiFilter())
 {
 }
 
 Technique::~Technique()
 {
     cleanup();
-    delete m_openglFilter;
+    delete m_graphicsApiFilter;
 }
 
 void Technique::cleanup()
@@ -87,9 +87,9 @@ void Technique::updateFromPeer(Qt3DCore::QNode *peer)
         Q_FOREACH (QAnnotation *annotation, technique->annotations())
             appendAnnotation(annotation->id());
 
-        // Copy OpenGLFilter info from frontend OpenGLFilter
-        QOpenGLFilter *peerFilter = technique->openGLFilter();
-        m_openglFilter->copy(*peerFilter);
+        // Copy GraphicsApiFilter info from frontend GraphicsApiFilter
+        QGraphicsApiFilter *peerFilter = technique->graphicsApiFilter();
+        m_graphicsApiFilter->copy(*peerFilter);
     }
 }
 
@@ -99,10 +99,10 @@ void Technique::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     switch (e->type()) {
 
     case NodeUpdated: {
-        if (propertyChange->propertyName() == QByteArrayLiteral("openGLFilter")) {
-            QOpenGLFilter *filter = propertyChange->value().value<QOpenGLFilter *>();
+        if (propertyChange->propertyName() == QByteArrayLiteral("graphicsApiFilter")) {
+            QGraphicsApiFilter *filter = propertyChange->value().value<QGraphicsApiFilter *>();
             if (filter != Q_NULLPTR) {
-                m_openglFilter->copy(*filter);
+                m_graphicsApiFilter->copy(*filter);
                 delete filter;
             }
         }
@@ -166,9 +166,9 @@ QList<Qt3DCore::QNodeId> Technique::renderPasses() const
     return m_renderPasses;
 }
 
-QOpenGLFilter *Technique::openGLFilter() const
+QGraphicsApiFilter *Technique::graphicsApiFilter() const
 {
-    return m_openglFilter;
+    return m_graphicsApiFilter;
 }
 
 void Technique::appendAnnotation(const Qt3DCore::QNodeId &criterionId)
diff --git a/src/render/materialsystem/technique_p.h b/src/render/materialsystem/technique_p.h
index 896642d58..ffeea4c8f 100644
--- a/src/render/materialsystem/technique_p.h
+++ b/src/render/materialsystem/technique_p.h
@@ -61,7 +61,7 @@ namespace Qt3DRender {
 
 class QTechnique;
 class QParameter;
-class QOpenGLFilter;
+class QGraphicsApiFilter;
 class QAnnotation;
 class QRenderPass;
 
@@ -89,10 +89,10 @@ public:
 
     QList<Qt3DCore::QNodeId> annotations() const;
     QList<Qt3DCore::QNodeId> renderPasses() const;
-    QOpenGLFilter *openGLFilter() const;
+    QGraphicsApiFilter *graphicsApiFilter() const;
 
 private:
-    QOpenGLFilter *m_openglFilter;
+    QGraphicsApiFilter *m_graphicsApiFilter;
 
     ParameterPack m_parameterPack;
     QList<Qt3DCore::QNodeId> m_annotationList;