diff options
| author | Johan Klokkhammer Helsing <johan.helsing@theqtcompany.com> | 2016-03-31 09:48:46 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@theqtcompany.com> | 2016-04-01 06:41:50 +0000 |
| commit | d4451028906f91267af6b5439b9798fb337823ca (patch) | |
| tree | 0488287c8be27e503554c32946d51921fe6585ac /src/plugins | |
| parent | ecde73e9f5aa2b5d26e1497332d045130e1b5ccf (diff) | |
Remove traces of obsolete config flag "wayland-compositor"
The compositor is always built regardless of this config flag.
Consequently some of the documentation and configuration was
contradicting and confusing.
* Removes the mentions of the flag from the README
* Always build compositor tests
* Always build plugins
Update readme
Change-Id: I37b7d1f0250beb17780834928114ecefdf17684e
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/platforms.pro | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro index 43c02be03..4bee89291 100644 --- a/src/plugins/platforms/platforms.pro +++ b/src/plugins/platforms/platforms.pro @@ -7,16 +7,13 @@ config_wayland_egl { SUBDIRS += qwayland-egl } -#The following integrations are only useful with QtCompositor -contains(CONFIG, wayland-compositor) { - config_brcm_egl: \ - SUBDIRS += qwayland-brcm-egl +#The following integrations are only useful with QtWaylandCompositor +config_brcm_egl: \ + SUBDIRS += qwayland-brcm-egl - config_xcomposite { - contains(QT_CONFIG, egl): \ - SUBDIRS += qwayland-xcomposite-egl - !contains(QT_CONFIG, opengles2):config_glx: \ - SUBDIRS += qwayland-xcomposite-glx - } +config_xcomposite { + contains(QT_CONFIG, egl): \ + SUBDIRS += qwayland-xcomposite-egl + !contains(QT_CONFIG, opengles2):config_glx: \ + SUBDIRS += qwayland-xcomposite-glx } - |