diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-14 15:31:09 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-22 10:27:41 +0000 |
| commit | 92e7f15277f073cff9e59c009d9cf0f4a34103cc (patch) | |
| tree | aba6f6b341913a6a3796dd27f46ff2827e058169 /configure.json | |
| parent | be3b2de87fdba74a07836a3302c3d55316b2c3d1 (diff) | |
simplify conditions of dbus-linked feature
... by chaining it to the dbus feature, as is done for openssl/-linked.
Change-Id: Id1f9f761914c356d2a0056aa80213954dce3403d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.json b/configure.json index 53ecdd4a58..d2fb8b0175 100644 --- a/configure.json +++ b/configure.json @@ -1777,9 +1777,8 @@ "dbus-linked": { "description": "Qt D-Bus directly linked to libdbus", "enable": "input.dbus == 'linked'", - "disable": "input.dbus == 'runtime' || input.dbus == 'no'", - "autoDetect": "!config.android", - "condition": "tests.dbus", + "disable": "input.dbus == 'runtime'", + "condition": "features.dbus && tests.dbus", "output": [ "publicQtConfig", { "type": "library", "feature": "dbus", "test": "dbus" } |