qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Silence warnings about missing dbus-send command not found 

Without piping the output to /dev/null, we'd get the following:

  sh: dbus-send: command not found

And if dbus support is only limited to runtime support, we don't
treat it as a fatal error and only notice the user.

Change-Id: Ia7750a074b8d563bf9694fa8fa628b4017e8bb68
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Tor Arne Vestbø 2015-09-10 13:27:50 +02:00
parent f5b682d320
commit 5f3529be32
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/auto/auto.pro
View File

@ -32,8 +32,11 @@ cross_compile: SUBDIRS -= tools
# Disable the QtDBus tests if we can't connect to the session bus # Disable the QtDBus tests if we can't connect to the session bus
qtHaveModule(dbus) { qtHaveModule(dbus) {
!system("dbus-send --session --type=signal / local.AutotestCheck.Hello"): { !system("dbus-send --session --type=signal / local.AutotestCheck.Hello >/dev/null 2>&1") {
warning("QtDBus is enabled but session bus is not available. Please check the installation.") 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 SUBDIRS -= dbus
} }
} else { } else {