From 92e7f15277f073cff9e59c009d9cf0f4a34103cc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 14 Jul 2016 15:31:09 +0200 Subject: 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 --- configure.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'configure.json') 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" } -- cgit v1.2.3