Fix detection of ozone x11 support

Fixes: QTBUG-77011
Change-Id: I0136b360c74970b912124f6f308f598c80eceba3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 3 insertions, 15 deletions

diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
index 42e5b40c9..e407ede17 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -94,13 +94,9 @@ defineTest(runConfigure) {
             }
          }
 
-        !qtConfig(webengine-embedded-build): qtConfig(xcb) {
-             for(package, $$list("libdrm xcomposite xcursor xi xtst")) {
-                 !qtConfig(webengine-system-$$package) {
-                     skipBuild("A suitable version of $$package could not be found.")
-                     return(false)
-                 }
-             }
+        !qtConfig(webengine-embedded-build): qtConfig(xcb) : !qtConfig(webengine-ozone-x11) {
+            skipBuild("Could not find all necessary libraries for qpa-xcb support")
+            return(false)
         }
     }
 }
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
index 9efa8958f..d3eda85b2 100644
--- a/mkspecs/features/functions.prf
+++ b/mkspecs/features/functions.prf
@@ -121,11 +121,3 @@ defineReplace(pkgConfigHostExecutable) {
     return($$system_quote($$system_path($$wrapper_name)))
 }
 
-defineTest(hasX11Dependencies) {
-    for(package, $$list("libdrm xcomposite xcursor xi xtst")) {
-        !qtConfig(webengine-system-$$package) {
-            return(false)
-        }
-    }
-    return(true)
-}