From d26fe3c5d6d73b0663a33d2f25ed053cc1f70d5e Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 18 Sep 2020 18:01:37 +0200 Subject: Don't error out when configuring Qt on a headless system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Configuring and building Qt should not require a running dbus session bus. However, when building the html_docs target on a headless system, qmake bails out with error if dbus is linked in, while only showing a warning if it's not. This is unnecessary. We can warn in both cases, build the tests with dbus linked in. Running the tests will fail if there is no session bus, ie. tst_QDBusConnection_Delayed::delayedMessages fails with QVERIFY(session.isConnected); Pick-to: 5.15 Change-Id: Ia6b6e226398e87880449b003d28dfd76553bee2c Reviewed-by: Paul Wicking Reviewed-by: Topi Reiniö --- tests/auto/auto.pro | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 6bbed56e2f..bb4de3e2b3 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -18,10 +18,12 @@ qtHaveModule(dbus):!cross_compile:!boot2qt { system("dbus-send --session --type=signal / local.AutotestCheck.Hello >$$QMAKE_SYSTEM_NULL_DEVICE 2>&1") { SUBDIRS += dbus } else { - qtConfig(dbus-linked): \ - error("QtDBus is enabled but session bus is not available. Please check the installation.") - else: \ + qtConfig(dbus-linked) { + warning("QtDBus is enabled but session bus is not available. QtDBus tests will fail.") + SUBDIRS += dbus + } else: { warning("QtDBus is enabled with runtime support, but session bus is not available. Skipping QtDBus tests.") + } } } qtHaveModule(gui): SUBDIRS += gui -- cgit v1.2.3