diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-12-02 14:00:44 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-12-02 14:01:08 +0100 |
| commit | 05bf419b206f3cd078364cf67af2df4e4d1477c0 (patch) | |
| tree | c942e884e8f75a29bd9f281c993fbc85a0b832ed /src/src.pro | |
| parent | dd5e1ffd3e9e379574325193c8546d453c11303e (diff) | |
| parent | 3698b116a1973146b76319673cdb6787f13f2de6 (diff) | |
Merge branch 'wip-compositor-api' into dev
This introduces the new compositor API, removing the
old API (which was never officially supported).
Change-Id: I1dc01f0fb4edc749e34ed8356e56ad87d7d64913
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/src.pro b/src/src.pro index ed193bd3c..f9cf9172d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,13 +4,15 @@ sub_qtwaylandscanner.subdir = qtwaylandscanner sub_qtwaylandscanner.target = sub-qtwaylandscanner SUBDIRS += sub_qtwaylandscanner -# Don't build QtCompositor API unless explicitly enabled -contains(CONFIG, wayland-compositor) { - sub_compositor.subdir = compositor - sub_compositor.depends = sub-qtwaylandscanner - sub_compositor.target = sub-compositor - SUBDIRS += sub_compositor -} +sub_compositor.subdir = compositor +sub_compositor.depends = sub-qtwaylandscanner +sub_compositor.target = sub-compositor +SUBDIRS += sub_compositor + +sub_imports.subdir = imports +sub_imports.depends += sub-compositor +sub_imports.target = sub-imports +SUBDIRS += sub_imports sub_client.subdir = client sub_client.depends = sub-qtwaylandscanner @@ -18,8 +20,7 @@ sub_client.target = sub-client SUBDIRS += sub_client sub_plugins.subdir = plugins -sub_plugins.depends = sub-qtwaylandscanner sub-client -contains(CONFIG, wayland-compositor): sub_plugins.depends += sub-compositor +sub_plugins.depends = sub-qtwaylandscanner sub-client sub-compositor sub_plugins.target = sub-plugins SUBDIRS += sub_plugins |