summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/auto/auto.pro7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 6f06ba591f..9cab3c9e42 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -32,8 +32,11 @@ cross_compile: SUBDIRS -= tools
# Disable the QtDBus tests if we can't connect to the session bus
qtHaveModule(dbus) {
- !system("dbus-send --session --type=signal / local.AutotestCheck.Hello"): {
- warning("QtDBus is enabled but session bus is not available. Please check the installation.")
+ !system("dbus-send --session --type=signal / local.AutotestCheck.Hello >/dev/null 2>&1") {
+ contains(QT_CONFIG, dbus-linked): \
+ error("QtDBus is enabled but session bus is not available. Please check the installation.")
+ else: \
+ warning("QtDBus is enabled with runtime support, but session bus is not available. Skipping QtDBus tests.")
SUBDIRS -= dbus
}
} else {