Config tests for gl integration

Change-Id: Ie7d80e7591d11aa5df87ca5d5de4cd6c03928c83
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>

2 files changed, 53 insertions, 77 deletions

diff --git a/src/compositor/hardware_integration/hardware_integration.pri b/src/compositor/hardware_integration/hardware_integration.pri
index 372a1e1f0..c008521ac 100644
--- a/src/compositor/hardware_integration/hardware_integration.pri
+++ b/src/compositor/hardware_integration/hardware_integration.pri
@@ -1,6 +1,6 @@
 isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
 
-!mac:!isEqual(QT_WAYLAND_GL_CONFIG,nogl) {
+!isEqual(QT_WAYLAND_GL_CONFIG,nogl) {
     HEADERS += \
         $$PWD/graphicshardwareintegration.h
 
@@ -12,37 +12,32 @@ isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
     isEqual(QT_WAYLAND_GL_CONFIG, custom) {
         QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
     } else {
-        contains(QT_CONFIG, opengles2) {
-            isEqual(QT_WAYLAND_GL_CONFIG, xcomposite_egl) {
+        equals(QT_WAYLAND_GL_CONFIG, brcm_egl) {
+            CONFIG -= config_wayland_egl config_xcomposite
+        }
+
+        equals(QT_WAYLAND_GL_CONFIG, xcomposite) {
+            CONFIG -= config_wayland_egl config_brcm_egl
+        }
+
+        config_wayland_egl {
+            include (wayland_egl/wayland_egl.pri)
+            QT_WAYLAND_GL_INTEGRATION = wayland_egl
+        }else:config_brcm_egl {
+            include (brcm_egl/brcm_egl.pri)
+            QT_WAYLAND_GL_INTEGRATION = brcm_egl
+        }else:config_xcomposite{
+            config_egl{
+                include (xcomposite_egl/xcomposite_egl.pri)
                 QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
-                CONFIG += xcomposite_egl
-            } else:isEqual(QT_WAYLAND_GL_CONFIG, brcm_egl)|isEmpty(QT_WAYLAND_GL_CONFIG):config_brcm_egl {
-                QT_WAYLAND_GL_INTEGRATION = brcm_egl
-                CONFIG += brcm_egl
-            } else {
-                QT_WAYLAND_GL_INTEGRATION = wayland_egl
-                CONFIG += wayland_egl
-                DEFINES += MESA_EGL_NO_X11_HEADERS
+            }else:config_glx{
+                include (xcomposite_glx/xcomposite_glx.pri)
+                QT_WAYLAND_GL_INTEGRATION = xcomposite_glx
             }
-        } else {
-            QT_WAYLAND_GL_INTEGRATION = xcomposite_glx
-            CONFIG += xcomposite_glx
         }
     }
-    system(echo "Qt-Compositor configured with openGL: $$QT_WAYLAND_GL_INTEGRATION")
+    system(echo "Qt-Compositor configured with openGL integration: $$QT_WAYLAND_GL_INTEGRATION")
 } else {
     system(echo "Qt-Compositor configured as raster only compositor")
 }
 
-brcm_egl {
-    include (brcm_egl/brcm_egl.pri)
-}
-wayland_egl {
-    include (wayland_egl/wayland_egl.pri)
-}
-xcomposite_egl {
-    include (xcomposite_egl/xcomposite_egl.pri)
-}
-xcomposite_glx {
-    include (xcomposite_glx/xcomposite_glx.pri)
-}
diff --git a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
index 720f304bf..5fc7c4302 100644
--- a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
+++ b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
@@ -1,4 +1,4 @@
-QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
+isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
 contains(QT_CONFIG, opengl):!equals(QT_WAYLAND_GL_CONFIG, nogl) {
 
     DEFINES += QT_WAYLAND_GL_SUPPORT
@@ -9,61 +9,42 @@ contains(QT_CONFIG, opengl):!equals(QT_WAYLAND_GL_CONFIG, nogl) {
     SOURCES += \
         $$PWD/qwaylandglintegration.cpp
 
-    contains(QT_CONFIG, opengles2) {
-        isEqual(QT_WAYLAND_GL_CONFIG, xcomposite_egl) {
+    equals(QT_WAYLAND_GL_CONFIG, brcm_egl) {
+        CONFIG -= config_wayland_egl config_xcomposite
+    }
+
+    equals(QT_WAYLAND_GL_CONFIG, xcomposite) {
+        CONFIG -= config_wayland_egl config_brcm_egl
+    }
+
+    config_wayland_egl {
+        include ($$PWD/wayland_egl/wayland_egl.pri)
+        QT_WAYLAND_GL_INTEGRATION = wayland_egl
+    }else:config_brcm_egl {
+        include ($$PWD/brcm_egl/brcm_egl.pri)
+        QT_WAYLAND_GL_INTEGRATION = brcm_egl
+    }else:config_xcomposite {
+        config_egl {
+            include ($$PWD/xcomposite_egl/xcomposite_egl.pri)
             QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
-            CONFIG += xcomposite_egl
-        } else:isEqual(QT_WAYLAND_GL_CONFIG,readback) {
-            QT_WAYLAND_GL_INTEGRATION = readback_egl
-            CONFIG += readback_egl
-        } else:isEqual(QT_WAYLAND_GL_CONFIG, brcm_egl)|isEmpty(QT_WAYLAND_GL_CONFIG):config_brcm_egl {
-            QT_WAYLAND_GL_INTEGRATION = brcm_egl
-            CONFIG += brcm_egl
-        } else {
-            QT_WAYLAND_GL_INTEGRATION = wayland_egl
-            CONFIG += wayland_egl
+        }else:config_glx {
+            include ($$PWD/xcomposite_glx/xcomposite_glx.pri)
+            QT_WAYLAND_GL_INTEGRATION = xcomposite_glx
         }
-    } else:mac {
-        QT_WAYLAND_GL_INTEGRATION = readback_cgl
-        CONFIG += readback_cgl
-    } else {
-        isEqual(QT_WAYLAND_GL_CONFIG, readback) {
+    }else:mac {
+        include ($$PWD/readback_cgl/readback_cgl.pri)
+            QT_WAYLAND_GL_INTEGRATION = readback_cgl
+    }else {
+        config_egl {
+            include ($$PWD/readback_egl/readback_egl.pri)
+            QT_WAYLAND_GL_INTEGRATION = readback_egl
+        }else:config_glx {
+            include ($$PWD/readback_glx/readback_glx.pri)
             QT_WAYLAND_GL_INTEGRATION = readback_glx
-            CONFIG += readback_glx
-        } else {
-            QT_WAYLAND_GL_INTEGRATION = xcomposite_glx
-            CONFIG += xcomposite_glx
         }
     }
 
-    message("Wayland GL Integration: $$QT_WAYLAND_GL_INTEGRATION")
-}
+    system(echo "Qt Wayland plugin configured with openGL integration: $$QT_WAYLAND_GL_INTEGRATION")
 
-
-wayland_egl {
-    include ($$PWD/wayland_egl/wayland_egl.pri)
 }
 
-readback_egl {
-    include ($$PWD/readback_egl/readback_egl.pri)
-}
-
-brcm_egl {
-    include ($$PWD/brcm_egl/brcm_egl.pri)
-}
-
-readback_glx {
-    include ($$PWD/readback_glx/readback_glx.pri)
-}
-
-readback_cgl {
-    include ($$PWD/readback_cgl/readback_cgl.pri)
-}
-
-xcomposite_glx {
-    include ($$PWD/xcomposite_glx/xcomposite_glx.pri)
-}
-
-xcomposite_egl {
-    include ($$PWD/xcomposite_egl/xcomposite_egl.pri)
-}