3 files changed, 3 insertions, 9 deletions
diff --git a/examples/quick/scenegraph/graph/linenode.cpp b/examples/quick/scenegraph/graph/linenode.cpp
index 5d4d8acd20..6cdf063bb9 100644
--- a/examples/quick/scenegraph/graph/linenode.cpp
+++ b/examples/quick/scenegraph/graph/linenode.cpp
@@ -54,7 +54,7 @@
 
 #include <QtQuick/QSGMaterial>
 
-class LineShader : public QSGMaterialRhiShader
+class LineShader : public QSGMaterialShader
 {
 public:
     LineShader() {
@@ -70,7 +70,6 @@ class LineMaterial : public QSGMaterial
 public:
     LineMaterial()
     {
-        setFlag(SupportsRhiShader);
         setFlag(Blending);
     }
 
@@ -82,7 +81,6 @@ public:
 
     QSGMaterialShader *createShader() const override
     {
-        Q_ASSERT(flags().testFlag(RhiShaderWanted));
         return new LineShader;
     }
 
diff --git a/examples/quick/scenegraph/graph/noisynode.cpp b/examples/quick/scenegraph/graph/noisynode.cpp
index c39e775e98..c35b4ee01e 100644
--- a/examples/quick/scenegraph/graph/noisynode.cpp
+++ b/examples/quick/scenegraph/graph/noisynode.cpp
@@ -58,7 +58,7 @@
 
 #define NOISE_SIZE 64
 
-class NoisyShader : public QSGMaterialRhiShader
+class NoisyShader : public QSGMaterialShader
 {
 public:
     NoisyShader() {
@@ -76,7 +76,6 @@ class NoisyMaterial : public QSGMaterial
 public:
     NoisyMaterial()
     {
-        setFlag(SupportsRhiShader);
         setFlag(Blending);
     }
 
@@ -93,7 +92,6 @@ public:
 
     QSGMaterialShader *createShader() const override
     {
-        Q_ASSERT(flags().testFlag(RhiShaderWanted));
         return new NoisyShader;
     }
 
diff --git a/examples/quick/scenegraph/twotextureproviders/xorblender.cpp b/examples/quick/scenegraph/twotextureproviders/xorblender.cpp
index 9971f202a7..cb61679141 100644
--- a/examples/quick/scenegraph/twotextureproviders/xorblender.cpp
+++ b/examples/quick/scenegraph/twotextureproviders/xorblender.cpp
@@ -78,7 +78,7 @@ public:
     } state;
 };
 
-class XorBlendRhiShader : public QSGMaterialRhiShader
+class XorBlendRhiShader : public QSGMaterialShader
 {
 public:
     XorBlendRhiShader();
@@ -90,13 +90,11 @@ public:
 
 XorBlendMaterial::XorBlendMaterial()
 {
-    setFlag(SupportsRhiShader);
     setFlag(Blending);
 }
 
 QSGMaterialShader *XorBlendMaterial::createShader() const
 {
-    Q_ASSERT(flags().testFlag(RhiShaderWanted));
     return new XorBlendRhiShader;
 }