From 42f9fd5f077fe03cbc96f3b8392d22ee2a99bab0 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 17 Mar 2015 08:34:01 +0100 Subject: [PATCH] Do not build glx integration with -no-opengl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-44998 Change-Id: I57c18cd3621a59297d3f91026903628ea6187a5f Reviewed-by: Jørgen Lind --- src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro b/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro index 29fddeabd4..29b6d1d2f7 100644 --- a/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro +++ b/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro @@ -4,6 +4,6 @@ contains(QT_CONFIG, egl):contains(QT_CONFIG, egl_x11) { SUBDIRS += xcb_egl } -contains(QT_CONFIG, xcb-xlib):!contains(QT_CONFIG, opengles2) { +contains(QT_CONFIG, xcb-xlib): contains(QT_CONFIG, opengl): !contains(QT_CONFIG, opengles2) { SUBDIRS += xcb_glx }