summaryrefslogtreecommitdiffstats
path: root/src/plugins/hardwareintegration/client
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-11-08 00:18:21 +0100
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-11-11 13:22:40 +0000
commit4d3c3a08eba8d30805f18397c98e19ab9fd40722 (patch)
tree48ac4f501c278067571004f0562bf487a798925f /src/plugins/hardwareintegration/client
parent51abcc7460da76bd64d4336dcf253c571b820e71 (diff)
Get rid of the egl config test and use what qtbase provides
contains(QT_CONFIG, egl) and CONFIG += egl is the only sane way to test for and pull in EGL headers and libs. This is particularly important when trying to be robust and guard against half-broken sysroots on embedded where a naive PKGCONFIG += egl breaks. Also add an EGL_WAYLAND_BUFFER_WL define to keep wayland-egl compiling. We are not testing for that in any config tests may cause a failure in sysroots that have parts of Mesa thrown in but pick ip an older EGL header from the vendor's driver. Change-Id: I7b7e6a7a91e78dbda5b6954ad08761298c538efc Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Diffstat (limited to 'src/plugins/hardwareintegration/client')
-rw-r--r--src/plugins/hardwareintegration/client/client.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro
index b7a9b46e..37a90ab0 100644
--- a/src/plugins/hardwareintegration/client/client.pro
+++ b/src/plugins/hardwareintegration/client/client.pro
@@ -7,7 +7,7 @@ config_brcm_egl: \
SUBDIRS += brcm-egl
config_xcomposite {
- config_egl: \
+ contains(QT_CONFIG, egl): \
SUBDIRS += xcomposite-egl
!contains(QT_CONFIG, opengles2):config_glx: \