diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-12-02 10:30:40 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-12-02 10:35:50 +0100 |
| commit | 3698b116a1973146b76319673cdb6787f13f2de6 (patch) | |
| tree | de31e4c3365d6852ed1f41621960ac9e48e85106 /src/plugins/hardwareintegration | |
| parent | 68993c012b88df43b2cd75a8c8704092760f28c0 (diff) | |
| parent | 4d3c3a08eba8d30805f18397c98e19ab9fd40722 (diff) | |
Merge remote-tracking branch 'qt/5.6' into wip-compositor-api
Change-Id: Ie70fdd03e1259a8cb75bbdbf1324e3e4a2b51807
Diffstat (limited to 'src/plugins/hardwareintegration')
| -rw-r--r-- | src/plugins/hardwareintegration/client/client.pro | 2 | ||||
| -rw-r--r-- | src/plugins/hardwareintegration/compositor/compositor.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro index b7a9b46ee..37a90ab0d 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: \ diff --git a/src/plugins/hardwareintegration/compositor/compositor.pro b/src/plugins/hardwareintegration/compositor/compositor.pro index 215cd2571..1ecfe37a0 100644 --- a/src/plugins/hardwareintegration/compositor/compositor.pro +++ b/src/plugins/hardwareintegration/compositor/compositor.pro @@ -6,7 +6,7 @@ config_brcm_egl: \ SUBDIRS += brcm-egl config_xcomposite { - config_egl: \ + contains(QT_CONFIG, egl): \ SUBDIRS += xcomposite-egl !contains(QT_CONFIG, opengles2):config_glx: \ |