Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ibb342cc5fc55ff9a3f4b3ecbd53936b57bc13e63

1 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro
index 4f69ca8aab..49a1c1b320 100644
--- a/src/plugins/platforms/xcb/xcb-plugin.pro
+++ b/src/plugins/platforms/xcb/xcb-plugin.pro
@@ -81,15 +81,7 @@ contains(QT_CONFIG, xcb-sm) {
 }
 
 contains(QT_CONFIG, opengl) {
-    contains(QT_CONFIG, opengles2) {
-        DEFINES += XCB_USE_EGL
-        CONFIG += egl
-        HEADERS += qxcbeglsurface.h
-
-        # EGL on MeeGo 1.2 Harmattan needs this macro to map EGLNativeDisplayType
-        # and other types to the correct X11 types
-        DEFINES += SUPPORT_X11
-    } else:contains(QT_CONFIG, xcb-xlib) {
+    contains(QT_CONFIG, xcb-xlib):contains(QT_CONFIG, glx) {
         DEFINES += XCB_USE_GLX
         HEADERS += qglxintegration.h
         SOURCES += qglxintegration.cpp
@@ -98,6 +90,14 @@ contains(QT_CONFIG, opengl) {
             DEFINES += XCB_HAS_XCB_GLX
             LIBS += -lxcb-glx
         }
+    } else:contains(QT_CONFIG, egl) {
+        DEFINES += XCB_USE_EGL
+        CONFIG += egl
+        HEADERS += qxcbeglsurface.h
+
+        # EGL on MeeGo 1.2 Harmattan needs this macro to map EGLNativeDisplayType
+        # and other types to the correct X11 types
+        DEFINES += SUPPORT_X11
     }
 }