diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2013-01-31 12:48:54 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2013-02-05 12:06:11 +0100 |
| commit | 634c4f6877d63cc30914049989b5cbfd18cd15c3 (patch) | |
| tree | a928ac8ef4750b3a0e597c001a5bb7e081203cc0 /tests | |
| parent | b0582106afe1ebb8a77c6d442966f76bde40f092 (diff) | |
Don't build QtCompositor unless explicitly enabled
The QtCompositor API is to be considered experimental
in Qt 5.1 and thus it should be disabled from being
built by default. If the qmake variable CONFIG
contains "wayland-compositor" then the QtCompositor
API will be built.
Change-Id: If10f5a688749f31338a80be45bbec22a0f2d12da
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 2f3167d68..5e6056181 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,2 +1,8 @@ TEMPLATE=subdirs -SUBDIRS=client compositor +SUBDIRS=client + +#Only build compositor test when we are +#building QtCompositor +contains(CONFIG, wayland-compositor) { + SUBDIRS += compositor +} |