From dd988e2074fa8d7d230b14ab997bcfc86dc6e1a4 Mon Sep 17 00:00:00 2001
From: Gatis Paeglis <gatis.paeglis@qt.io>
Date: Thu, 27 Dec 2018 01:10:29 +0100
Subject: [PATCH] configure: add XCB GL integration features

This way Qt builders can see if everything has been configured
properly for XCB GL integrations at configure time, instead of
at the end of the build process.

Change-Id: I00740cc2edd7f6ecfcda0ddfb22649d1b4db4aa2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
---
 src/gui/configure.json                        | 26 ++++++++++++++++---
 .../xcb/gl_integrations/gl_integrations.pro   |  4 +--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/gui/configure.json b/src/gui/configure.json
index f33f34ec60..582705f402 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -1531,12 +1531,24 @@
             "emitIf": "features.xcb",
             "output": [ { "type": "varAssign", "name": "QMAKE_X11_PREFIX", "value": "tests.x11prefix.value" } ]
         },
-        "xcb-glx": {
-            "label": "XCB GLX",
+        "xcb-glx-plugin": {
+            "label": "GLX Plugin",
             "emitIf": "features.xcb",
+            "condition": "features.xcb-xlib && features.opengl && !features.opengles2",
+            "output": [ "privateFeature" ]
+        },
+        "xcb-glx": {
+            "label": "  XCB GLX",
+            "emitIf": "features.xcb && features.xcb-glx-plugin",
             "condition": "libs.xcb_glx",
             "output": [ "privateFeature" ]
         },
+        "xcb-egl-plugin": {
+            "label": "EGL-X11 Plugin",
+            "emitIf": "features.xcb",
+            "condition": "features.egl_x11 && features.opengl",
+            "output": [ "privateFeature" ]
+        },
         "xcb-native-painting": {
             "label": "Native painting (experimental)",
             "emitIf": "features.xcb",
@@ -1941,7 +1953,15 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla
                     "section": "XCB",
                     "condition": "features.xcb",
                     "entries": [
-                        "system-xcb", "xkb", "xcb-xinput", "xcb-glx", "xcb-native-painting"
+                        "system-xcb", "xkb", "xcb-xinput", "xcb-native-painting",
+                        {
+                            "section": "GL integrations",
+                            "entries": [
+                                "xcb-glx-plugin",
+                                "xcb-glx",
+                                "xcb-egl-plugin"
+                            ]
+                        }
                     ]
                 },
                 {
diff --git a/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro b/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro
index b8f878ffe8..dde176433c 100644
--- a/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro
+++ b/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro
@@ -1,10 +1,10 @@
 TEMPLATE = subdirs
 QT_FOR_CONFIG += gui-private
 
-qtConfig(egl):qtConfig(egl_x11):qtConfig(opengl) {
+qtConfig(xcb-egl-plugin) {
     SUBDIRS += xcb_egl
 }
 
-qtConfig(xcb-xlib):qtConfig(opengl):!qtConfig(opengles2) {
+qtConfig(xcb-glx-plugin) {
     SUBDIRS += xcb_glx
 }