diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-24 07:37:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-24 07:38:02 +0100 |
| commit | 135ebe4f3d268121047fdbfee49f2dd52006165e (patch) | |
| tree | 6b303103f36e69e29cfa860b8b7afc584c55d6f3 /src/plugins/platforms/xcb/gl_integrations | |
| parent | e7feb956280105113b3e58f12e5f32f54199a95a (diff) | |
| parent | 1e8f50a8d069c97ea6a4f00d664c12e594884f54 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: If5d2e621c2fa5476c3ab687a3f4620c54fc3b32e
Diffstat (limited to 'src/plugins/platforms/xcb/gl_integrations')
| -rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro | 2 |
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 } |