diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-07 14:04:17 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-10 08:20:53 +0000 |
commit | 00fba62ce3e5bd00ba5e8ab6f5b7a71bdb93c6a1 (patch) | |
tree | 1a135ec31593b76c38849621f1d4ecc5508266d8 /src/src.pro | |
parent | 762d384b806deb84072a5c7eb6b91afa1e150c1f (diff) | |
download | qtwayland-00fba62ce3e5bd00ba5e8ab6f5b7a71bdb93c6a1.tar.gz |
Rename QtCompositor to QtWaylandCompositor
enable building QtWaylandCompositor by default
Change-Id: I7cf34052b304ca9fef55b7e30ef6a6367b5d75f1
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/src.pro')
-rw-r--r-- | src/src.pro | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/src.pro b/src/src.pro index 6dc62e8e..bf5ffe36 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,18 +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-client - sub_imports.target = sub-imports - SUBDIRS += sub_imports -} +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 @@ -23,7 +20,6 @@ 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 |