From 9cdf9973c60f6974fe9b405b10ef9cffef7ae4f2 Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Wed, 31 Aug 2011 14:07:54 +0200
Subject: The XCB plugin should not rely on QT_CONFIG=opengl anymore

Change-Id: Ieeedb7eb68704df811c613873bd2fc4b77e2aa04
Reviewed-on: http://codereview.qt.nokia.com/3966
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kevin Simons <kevin.simons@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/plugins/platforms/xcb/xcb.pro | 40 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

(limited to 'src/plugins/platforms/xcb/xcb.pro')

diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro
index ba36ab14fb..7700b4865c 100644
--- a/src/plugins/platforms/xcb/xcb.pro
+++ b/src/plugins/platforms/xcb/xcb.pro
@@ -53,29 +53,25 @@ contains(QT_CONFIG, xcb-render) {
     LIBS += -lxcb-render -lxcb-render-util
 }
 
-contains(QT_CONFIG, opengl) {
-    QT += opengl
-
 #    DEFINES += XCB_USE_DRI2
-    contains(DEFINES, XCB_USE_DRI2) {
-        LIBS += -lxcb-dri2 -lEGL
-
-        CONFIG += link_pkgconfig
-        PKGCONFIG += libdrm
-
-        HEADERS += qdri2context.h
-        SOURCES += qdri2context.cpp
-
-    } else {
-        contains(QT_CONFIG, opengles2) {
-            DEFINES += XCB_USE_EGL
-            LIBS += -lEGL
-            HEADERS += qxcbeglsurface.h
-        } else:contains(QT_CONFIG, xcb-xlib) {
-            DEFINES += XCB_USE_GLX
-            HEADERS += qglxintegration.h
-            SOURCES += qglxintegration.cpp
-        }
+contains(DEFINES, XCB_USE_DRI2) {
+    LIBS += -lxcb-dri2 -lEGL
+
+    CONFIG += link_pkgconfig
+    PKGCONFIG += libdrm
+
+    HEADERS += qdri2context.h
+    SOURCES += qdri2context.cpp
+
+} else {
+    contains(QT_CONFIG, opengles2) {
+        DEFINES += XCB_USE_EGL
+        LIBS += -lEGL
+        HEADERS += qxcbeglsurface.h
+    } else:contains(QT_CONFIG, xcb-xlib) {
+        DEFINES += XCB_USE_GLX
+        HEADERS += qglxintegration.h
+        SOURCES += qglxintegration.cpp
     }
 }
 
-- 
cgit v1.2.3