d26fe3c5d6
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 <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
38 lines
1.3 KiB
Prolog
38 lines
1.3 KiB
Prolog
TEMPLATE = subdirs
|
|
|
|
uikit {
|
|
SUBDIRS = corelib
|
|
qtHaveModule(gui): SUBDIRS += gui
|
|
return()
|
|
}
|
|
|
|
# Order by dependency [*], then alphabetic. [*] If bugs in part A of
|
|
# our source would break tests of part B, then test A before B.
|
|
SUBDIRS += testlib
|
|
qtConfig(process):!cross_compile: SUBDIRS += tools
|
|
SUBDIRS += corelib
|
|
qtHaveModule(concurrent): SUBDIRS += concurrent
|
|
# QTBUG-63915: boot2qt fails dbus
|
|
qtHaveModule(dbus):!cross_compile:!boot2qt {
|
|
# Disable the QtDBus tests if we can't connect to the session bus
|
|
system("dbus-send --session --type=signal / local.AutotestCheck.Hello >$$QMAKE_SYSTEM_NULL_DEVICE 2>&1") {
|
|
SUBDIRS += dbus
|
|
} 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
|
|
qtHaveModule(network): SUBDIRS += network
|
|
qtHaveModule(opengl): SUBDIRS += opengl
|
|
qtHaveModule(printsupport): SUBDIRS += printsupport
|
|
qtHaveModule(sql): SUBDIRS += sql
|
|
qtHaveModule(widgets): SUBDIRS += widgets
|
|
qtHaveModule(xml): SUBDIRS += xml
|
|
SUBDIRS += other
|
|
|