Clean up QT_CONFIG(opengl)

Accelerated graphics is now possible without OpenGL support. With
this change, a Qt build with -no-opengl can still run Qt Quick with
a Vulkan, Metal, or Direct3D backend.

Fixes: QTBUG-84027
Change-Id: Ib63c733d28cfdf7de16b138df136fa7628e1747b
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

7 files changed, 9 insertions, 12 deletions

diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt
index c52566a954..addaaa6bde 100644
--- a/tests/auto/.prev_CMakeLists.txt
+++ b/tests/auto/.prev_CMakeLists.txt
@@ -10,9 +10,9 @@ add_subdirectory(toolsupport)
 if(NOT UIKIT)
     add_subdirectory(qmltest)
 endif()
-if(TARGET Qt::Gui AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3))
+if(TARGET Qt::Gui)
     add_subdirectory(particles)
 endif()
-if(TARGET Qt::Gui AND TARGET Qt::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3))
+if(TARGET Qt::Widgets)
     add_subdirectory(quickwidgets)
 endif()
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index eb1c2d34df..cdec7346eb 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -12,9 +12,9 @@ add_subdirectory(toolsupport)
 if(NOT UIKIT)
     add_subdirectory(qmltest)
 endif()
-if(TARGET Qt::Gui AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3))
+if(TARGET Qt::Gui)
     add_subdirectory(particles)
 endif()
-if(TARGET Qt::Gui AND TARGET Qt::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3))
+if(TARGET Qt::Widgets)
     add_subdirectory(quickwidgets)
 endif()
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index d967b01d61..35dfe5dfbd 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -9,10 +9,8 @@ SUBDIRS=\
     installed_cmake \
     toolsupport
 
-qtHaveModule(gui):qtConfig(opengl(es1|es2)?) {
-    SUBDIRS += particles
-    qtHaveModule(widgets): SUBDIRS += quickwidgets
-}
+qtHaveModule(gui):     SUBDIRS += particles
+qtHaveModule(widgets): SUBDIRS += quickwidgets
 
 # console applications not supported
 uikit: SUBDIRS -= qmltest
diff --git a/tests/auto/quick/qquickrendercontrol/CMakeLists.txt b/tests/auto/quick/qquickrendercontrol/CMakeLists.txt
index 4bb2e6928b..df20449a90 100644
--- a/tests/auto/quick/qquickrendercontrol/CMakeLists.txt
+++ b/tests/auto/quick/qquickrendercontrol/CMakeLists.txt
@@ -14,7 +14,6 @@ qt_add_test(tst_qquickrendercontrol
         Qt::CorePrivate
         Qt::Gui
         Qt::GuiPrivate
-        Qt::OpenGL
         Qt::QmlPrivate
         Qt::QuickPrivate
 )
diff --git a/tests/auto/quick/qquickrendercontrol/qquickrendercontrol.pro b/tests/auto/quick/qquickrendercontrol/qquickrendercontrol.pro
index 958abe316d..4f0101bf22 100644
--- a/tests/auto/quick/qquickrendercontrol/qquickrendercontrol.pro
+++ b/tests/auto/quick/qquickrendercontrol/qquickrendercontrol.pro
@@ -6,7 +6,7 @@ include (../../shared/util.pri)
 
 macos:CONFIG -= app_bundle
 
-QT += core-private gui-private qml-private quick-private testlib opengl
+QT += core-private gui-private qml-private quick-private testlib
 
 OTHER_FILES += \
     data/rect.qml
diff --git a/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt
index 06cce61350..0ce6f79ce1 100644
--- a/tests/benchmarks/CMakeLists.txt
+++ b/tests/benchmarks/CMakeLists.txt
@@ -2,6 +2,6 @@
 
 add_subdirectory(qml)
 add_subdirectory(quick)
-if(QT_FEATURE_private_tests AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3))
+if(QT_FEATURE_private_tests)
     add_subdirectory(particles)
 endif()
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index 6d62fa09d9..f70d4e52bd 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 SUBDIRS = qml quick
 qtConfig(private_tests) {
-    qtConfig(opengl(es1|es2)?):SUBDIRS += particles
+    SUBDIRS += particles
 }