summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-03-17 08:34:01 +0100
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-03-18 14:25:09 +0000
commit42f9fd5f077fe03cbc96f3b8392d22ee2a99bab0 (patch)
tree330c4894f20eb6c889fe29f417afbd418f1110d4
parent53a9ff2a450b63ab14045756402c5fb256690851 (diff)
Do not build glx integration with -no-opengl
Task-number: QTBUG-44998 Change-Id: I57c18cd3621a59297d3f91026903628ea6187a5f Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
-rw-r--r--src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro2
1 files changed, 1 insertions, 1 deletions
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
}