diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-09-26 09:22:33 +0200 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-02-27 15:15:40 +0200 |
| commit | 7df356ce960cc3b00bb264e8bd13992c3808ed42 (patch) | |
| tree | be9057de8879c845d8bf3bd8697386ed92961038 /src/src.pro | |
| parent | 80bf946e78b5b5b4276668249eb1fab769259426 (diff) | |
Simplify src.pro
This also makes it go more smoothly through the CMake conversion scripts.
Task-number: QTBUG-78177
Change-Id: Iee6a3e64028c146a641f540fa5a187ac5ac6b77b
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/src/src.pro b/src/src.pro index 3d68c69fb..e2f4124bd 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,34 +4,24 @@ include($$OUT_PWD/compositor/qtwaylandcompositor-config.pri) QT_FOR_CONFIG += waylandclient-private waylandcompositor-private qtConfig(wayland-client)|qtConfig(wayland-server) { - sub_qtwaylandscanner.subdir = qtwaylandscanner - sub_qtwaylandscanner.target = sub-qtwaylandscanner - SUBDIRS += sub_qtwaylandscanner + SUBDIRS += qtwaylandscanner qtConfig(wayland-client) { - sub_client.subdir = client - sub_client.depends = sub-qtwaylandscanner - sub_client.target = sub-client - SUBDIRS += sub_client + client.depends = qtwaylandscanner + SUBDIRS += client } - sub_plugins.subdir = plugins - sub_plugins.depends += sub-qtwaylandscanner - qtConfig(wayland-client):sub_plugins.depends += sub-client - qtConfig(wayland-server):sub_plugins.depends += sub-compositor - sub_plugins.target = sub-plugins - SUBDIRS += sub_plugins + plugins.depends += qtwaylandscanner + qtConfig(wayland-client):plugins.depends += client + qtConfig(wayland-server):plugins.depends += compositor + SUBDIRS += plugins qtConfig(wayland-server) { - sub_compositor.subdir = compositor - sub_compositor.depends = sub-qtwaylandscanner - sub_compositor.target = sub-compositor - SUBDIRS += sub_compositor + compositor.depends = qtwaylandscanner + SUBDIRS += compositor } - sub_imports.subdir = imports - qtConfig(wayland-client):sub_imports.depends += sub-client - qtConfig(wayland-server):sub_imports.depends += sub-compositor - sub_imports.target = sub-imports - SUBDIRS += sub_imports + qtConfig(wayland-client):imports.depends += client + qtConfig(wayland-server):imports.depends += compositor + SUBDIRS += imports } |