From 9e48958d72d752e460fe697a1fb13bbc6fcd54e9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Mon, 11 Apr 2011 14:50:47 +0200
Subject: [PATCH] Add a custom rule for hardware_integration

This enables the compositor pro file to include another pri file which
implements the hardware integration
---
 .../hardware_integration/hardware_integration.pri  | 36 ++++++++++++----------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/qt-compositor/hardware_integration/hardware_integration.pri b/src/qt-compositor/hardware_integration/hardware_integration.pri
index 8c82d08..a988c20 100644
--- a/src/qt-compositor/hardware_integration/hardware_integration.pri
+++ b/src/qt-compositor/hardware_integration/hardware_integration.pri
@@ -1,28 +1,32 @@
 contains(QT_CONFIG, opengl) {
-HEADERS += \
-    $$PWD/graphicshardwareintegration.h
+    HEADERS += \
+        $$PWD/graphicshardwareintegration.h
 
-SOURCES += \
-    $$PWD/graphicshardwareintegration.cpp
+    SOURCES += \
+        $$PWD/graphicshardwareintegration.cpp
 
     DEFINES += QT_COMPOSITOR_WAYLAND_GL
     QT += opengl
 
     QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
-    contains(QT_CONFIG, opengles2) {
-        isEqual(QT_WAYLAND_GL_CONFIG, wayland_egl) {
-            QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
-            CONFIG += mesa_egl
-        } else:isEqual(QT_WAYLAND_GL_CONFIG,dri2_xcb) {
-            QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
-            CONFIG += dri2_xcb
+    isEqual(QT_WAYLAND_GL_CONFIG, custom) {
+        QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
+    } else {
+        contains(QT_CONFIG, opengles2) {
+            isEqual(QT_WAYLAND_GL_CONFIG, wayland_egl) {
+                QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
+                CONFIG += mesa_egl
+            } else:isEqual(QT_WAYLAND_GL_CONFIG,dri2_xcb) {
+                QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
+                CONFIG += dri2_xcb
+            } else {
+                QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
+                CONFIG += xcomposite_egl
+            }
         } else {
-            QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
-            CONFIG += xcomposite_egl
+            QT_WAYLAND_GL_INTEGRATION = xcomposite_glx
+            CONFIG += xcomposite_glx
         }
-    } else {
-        QT_WAYLAND_GL_INTEGRATION = xcomposite_glx
-        CONFIG += xcomposite_glx
     }
     system(echo "Qt-Compositor configured with openGL: $$QT_WAYLAND_GL_INTEGRATION")
 } else {
-- 
2.7.4