Fix exclusion for legacy Open GL examples.

Add dynamic GL and remove warning about ANGLE since that
package no longer exists.

Task-number: QTBUG-46103
Change-Id: Icf93d1105434395a3c9ad61bb8c921fcedfc7137
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

8 files changed, 8 insertions, 40 deletions

diff --git a/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro b/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro
index 6171450925..78fc6b1a63 100644
--- a/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro
+++ b/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro
@@ -8,8 +8,4 @@ QT += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/framebufferobject2
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.) {
-    contains(QT_CONFIG, angle): \
-        warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
-    error("This example requires Qt to be configured with -opengl desktop")
-}
+contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/grabber/grabber.pro b/examples/opengl/legacy/grabber/grabber.pro
index 88485ff183..1db0e23156 100644
--- a/examples/opengl/legacy/grabber/grabber.pro
+++ b/examples/opengl/legacy/grabber/grabber.pro
@@ -9,8 +9,4 @@ QT           += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/grabber
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.) {
-    contains(QT_CONFIG, angle): \
-        warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
-    error("This example requires Qt to be configured with -opengl desktop")
-}
+contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/hellogl/hellogl.pro b/examples/opengl/legacy/hellogl/hellogl.pro
index 01e8ca1f74..bb75b07200 100644
--- a/examples/opengl/legacy/hellogl/hellogl.pro
+++ b/examples/opengl/legacy/hellogl/hellogl.pro
@@ -14,8 +14,4 @@ QT           += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/hellogl
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.) {
-    contains(QT_CONFIG, angle): \
-        warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
-    error("This example requires Qt to be configured with -opengl desktop")
-}
+contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/overpainting/overpainting.pro b/examples/opengl/legacy/overpainting/overpainting.pro
index 9187314b75..cbed7eed2b 100644
--- a/examples/opengl/legacy/overpainting/overpainting.pro
+++ b/examples/opengl/legacy/overpainting/overpainting.pro
@@ -16,8 +16,4 @@ SOURCES = bubble.cpp \
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/overpainting
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.) {
-    contains(QT_CONFIG, angle): \
-        warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
-    error("This example requires Qt to be configured with -opengl desktop")
-}
+contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/pbuffers/pbuffers.pro b/examples/opengl/legacy/pbuffers/pbuffers.pro
index fe88de05d1..d779a2a2dc 100644
--- a/examples/opengl/legacy/pbuffers/pbuffers.pro
+++ b/examples/opengl/legacy/pbuffers/pbuffers.pro
@@ -10,8 +10,4 @@ QT += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/pbuffers
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.) {
-    contains(QT_CONFIG, angle): \
-        warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
-    error("This example requires Qt to be configured with -opengl desktop")
-}
+contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/pbuffers2/pbuffers2.pro b/examples/opengl/legacy/pbuffers2/pbuffers2.pro
index f331498d3a..2ba40a6f74 100644
--- a/examples/opengl/legacy/pbuffers2/pbuffers2.pro
+++ b/examples/opengl/legacy/pbuffers2/pbuffers2.pro
@@ -8,8 +8,4 @@ RESOURCES += pbuffers2.qrc
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/pbuffers2
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.) {
-    contains(QT_CONFIG, angle): \
-        warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
-    error("This example requires Qt to be configured with -opengl desktop")
-}
+contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/samplebuffers/samplebuffers.pro b/examples/opengl/legacy/samplebuffers/samplebuffers.pro
index 9b471243f3..3719f5039d 100644
--- a/examples/opengl/legacy/samplebuffers/samplebuffers.pro
+++ b/examples/opengl/legacy/samplebuffers/samplebuffers.pro
@@ -7,8 +7,4 @@ QT += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/samplebuffers
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.) {
-    contains(QT_CONFIG, angle): \
-        warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
-    error("This example requires Qt to be configured with -opengl desktop")
-}
+contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/widgets/graphicsview/boxes/boxes.pro b/examples/widgets/graphicsview/boxes/boxes.pro
index e608b1c845..15d26f02f0 100644
--- a/examples/widgets/graphicsview/boxes/boxes.pro
+++ b/examples/widgets/graphicsview/boxes/boxes.pro
@@ -1,10 +1,6 @@
 QT += opengl widgets
 
-contains(QT_CONFIG, opengles.) {
-    contains(QT_CONFIG, angle): \
-        warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
-    error("This example requires Qt to be configured with -opengl desktop")
-}
+contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
 
 HEADERS += 3rdparty/fbm.h \
            glbuffers.h \