diff options
author | Andreas Buhr <andreas.buhr@qt.io> | 2021-08-18 13:03:45 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-30 06:16:43 +0000 |
commit | d20798bd7a42e8751180d906c35db94e9e5f89b2 (patch) | |
tree | b88a9872451fb74428da6be2a2e0db6e1439b97f | |
parent | becd0fdc4231b2b887ea9030e3f9f22a6cb8d530 (diff) |
Remove BlueZ4 detection
Even though BlueZ 4 is no longer supported, detection for
it was still in the code. This patch removes it.
Task-number: QTBUG-75342
Change-Id: I274993a93404603a51499f8ea967193b450bb6da
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 84a66e212fdfe01ba7ddc9da2e380022305cde41)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/bluetooth/bluez/bluez5_helper.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/bluetooth/bluez/bluez5_helper.cpp b/src/bluetooth/bluez/bluez5_helper.cpp index 57f40121..5f368c8e 100644 --- a/src/bluetooth/bluez/bluez5_helper.cpp +++ b/src/bluetooth/bluez/bluez5_helper.cpp @@ -56,7 +56,6 @@ Q_DECLARE_LOGGING_CATEGORY(QT_BT_BLUEZ) typedef enum Bluez5TestResultType { BluezVersionUnknown, - BluezVersion4, BluezVersion5, BluezNotAvailable } Bluez5TestResult; @@ -91,20 +90,10 @@ bool isBluez5() QDBusPendingReply<ManagedObjectList> reply = manager.GetManagedObjects(); reply.waitForFinished(); if (reply.isError()) { - // not Bluez 5.x - OrgBluezManagerInterface manager_bluez4(QStringLiteral("org.bluez"), - QStringLiteral("/"), - QDBusConnection::systemBus()); - QDBusPendingReply<QList<QDBusObjectPath> > reply - = manager_bluez4.ListAdapters(); - reply.waitForFinished(); - if (reply.isError()) { - *bluezVersion() = BluezNotAvailable; - qWarning() << "Cannot find a running Bluez. Please check the Bluez installation."; - } else { - *bluezVersion() = BluezVersion4; - qCDebug(QT_BT_BLUEZ) << "Bluez 4 detected."; - } + *bluezVersion() = BluezNotAvailable; + qWarning() << "Cannot find a compatible running Bluez. " + "Please check the Bluez installation. " + "QtBluetooth requires at least BlueZ version 5."; } else { *bluezVersion() = BluezVersion5; qCDebug(QT_BT_BLUEZ) << "Bluez 5 detected."; |