Remove BlueZ4 XML files and their usage

The BlueZ4 DBUS interface is described in XML files.
After removal of BlueZ4 support, this patch removes these.

Task-number: QTBUG-75342
Change-Id: Ib6da83d2dd6cb5c5c3875d1a717bd8e30a617eb4
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 69b4f604744322699abb8e4baffbe38d60c504f5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

20 files changed, 0 insertions, 774 deletions

diff --git a/src/bluetooth/CMakeLists.txt b/src/bluetooth/CMakeLists.txt
index b93de41b..6333b5a3 100644
--- a/src/bluetooth/CMakeLists.txt
+++ b/src/bluetooth/CMakeLists.txt
@@ -54,26 +54,22 @@ qt_internal_add_module(Bluetooth
 if(QT_FEATURE_bluez)
     qt_internal_extend_target(Bluetooth
         SOURCES
-            bluez/adapter.cpp bluez/adapter_p.h
             bluez/adapter1_bluez5.cpp bluez/adapter1_bluez5_p.h
             bluez/battery1.cpp bluez/battery1_p.h
             bluez/bluetoothmanagement.cpp bluez/bluetoothmanagement_p.h
             bluez/bluez5_helper.cpp bluez/bluez5_helper_p.h
             bluez/bluez_data_p.h
-            bluez/device.cpp bluez/device_p.h
             bluez/device1_bluez5.cpp bluez/device1_bluez5_p.h
             bluez/gattchar1.cpp bluez/gattchar1_p.h
             bluez/gattdesc1.cpp bluez/gattdesc1_p.h
             bluez/gattservice1.cpp bluez/gattservice1_p.h
             bluez/hcimanager.cpp bluez/hcimanager_p.h
-            bluez/manager.cpp bluez/manager_p.h
             bluez/objectmanager.cpp bluez/objectmanager_p.h
             bluez/profile1.cpp bluez/profile1_p.h
             bluez/profile1context.cpp bluez/profile1context_p.h
             bluez/profilemanager1.cpp bluez/profilemanager1_p.h
             bluez/properties.cpp bluez/properties_p.h
             bluez/remotedevicemanager.cpp bluez/remotedevicemanager_p.h
-            bluez/service.cpp bluez/service_p.h
             bluez/servicemap.cpp bluez/servicemap_p.h
             qbluetoothdevicediscoveryagent_bluez.cpp
             qbluetoothlocaldevice_bluez.cpp
diff --git a/src/bluetooth/bluez/adapter.cpp b/src/bluetooth/bluez/adapter.cpp
deleted file mode 100644
index eaea76f8..00000000
--- a/src/bluetooth/bluez/adapter.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p adapter_p.h:adapter.cpp org.bluez.all.xml org.bluez.Adapter
- *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "adapter_p.h"
-
-/*
- * Implementation of interface class OrgBluezAdapterInterface
- */
-
-OrgBluezAdapterInterface::OrgBluezAdapterInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OrgBluezAdapterInterface::~OrgBluezAdapterInterface()
-{
-}
-
diff --git a/src/bluetooth/bluez/adapter_p.h b/src/bluetooth/bluez/adapter_p.h
deleted file mode 100644
index 236fe7e4..00000000
--- a/src/bluetooth/bluez/adapter_p.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p adapter_p.h:adapter.cpp org.bluez.all.xml org.bluez.Adapter
- *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef ADAPTER_P_H
-#define ADAPTER_P_H
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-
-/*
- * Proxy class for interface org.bluez.Adapter
- */
-class OrgBluezAdapterInterface: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.bluez.Adapter"; }
-
-public:
-    OrgBluezAdapterInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
-
-    ~OrgBluezAdapterInterface();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<> CancelDeviceCreation(const QString &in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0);
-        return asyncCallWithArgumentList(QStringLiteral("CancelDeviceCreation"), argumentList);
-    }
-
-    inline QDBusPendingReply<QDBusObjectPath> CreateDevice(const QString &in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0);
-        return asyncCallWithArgumentList(QStringLiteral("CreateDevice"), argumentList);
-    }
-
-    inline QDBusPendingReply<QDBusObjectPath> CreatePairedDevice(const QString &in0, const QDBusObjectPath &in1, const QString &in2)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1) << QVariant::fromValue(in2);
-        return asyncCallWithArgumentList(QStringLiteral("CreatePairedDevice"), argumentList);
-    }
-
-    inline QDBusPendingReply<QDBusObjectPath> FindDevice(const QString &in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0);
-        return asyncCallWithArgumentList(QStringLiteral("FindDevice"), argumentList);
-    }
-
-    inline QDBusPendingReply<QVariantMap> GetProperties()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("GetProperties"), argumentList);
-    }
-
-    inline QDBusPendingReply<QList<QDBusObjectPath> > ListDevices()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("ListDevices"), argumentList);
-    }
-
-    inline QDBusPendingReply<> RegisterAgent(const QDBusObjectPath &in0, const QString &in1)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1);
-        return asyncCallWithArgumentList(QStringLiteral("RegisterAgent"), argumentList);
-    }
-
-    inline QDBusPendingReply<> ReleaseMode()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("ReleaseMode"), argumentList);
-    }
-
-    inline QDBusPendingReply<> ReleaseSession()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("ReleaseSession"), argumentList);
-    }
-
-    inline QDBusPendingReply<> RemoveDevice(const QDBusObjectPath &in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0);
-        return asyncCallWithArgumentList(QStringLiteral("RemoveDevice"), argumentList);
-    }
-
-    inline QDBusPendingReply<> RequestMode(const QString &in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0);
-        return asyncCallWithArgumentList(QStringLiteral("RequestMode"), argumentList);
-    }
-
-    inline QDBusPendingReply<> RequestSession()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("RequestSession"), argumentList);
-    }
-
-    inline QDBusPendingReply<> SetProperty(const QString &in0, const QDBusVariant &in1)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1);
-        return asyncCallWithArgumentList(QStringLiteral("SetProperty"), argumentList);
-    }
-
-    inline QDBusPendingReply<> StartDiscovery()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("StartDiscovery"), argumentList);
-    }
-
-    inline QDBusPendingReply<> StopDiscovery()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("StopDiscovery"), argumentList);
-    }
-
-    inline QDBusPendingReply<> UnregisterAgent(const QDBusObjectPath &in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0);
-        return asyncCallWithArgumentList(QStringLiteral("UnregisterAgent"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void DeviceCreated(const QDBusObjectPath &in0);
-    void DeviceDisappeared(const QString &in0);
-    void DeviceFound(const QString &in0, const QVariantMap &in1);
-    void DeviceRemoved(const QDBusObjectPath &in0);
-    void PropertyChanged(const QString &in0, const QDBusVariant &in1);
-};
-
-namespace org {
-  namespace bluez {
-    typedef ::OrgBluezAdapterInterface Adapter;
-  }
-}
-#endif
diff --git a/src/bluetooth/bluez/bluez5_helper.cpp b/src/bluetooth/bluez/bluez5_helper.cpp
index 5f368c8e..8ec399cd 100644
--- a/src/bluetooth/bluez/bluez5_helper.cpp
+++ b/src/bluetooth/bluez/bluez5_helper.cpp
@@ -47,7 +47,6 @@
 #include "objectmanager_p.h"
 #include "properties_p.h"
 #include "adapter1_bluez5_p.h"
-#include "manager_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/bluetooth/bluez/device.cpp b/src/bluetooth/bluez/device.cpp
deleted file mode 100644
index 14b91ad0..00000000
--- a/src/bluetooth/bluez/device.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -i servicemap_p.h -p device_p.h:device.cpp org.bluez.Device.xml org.bluez.Device
- *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "device_p.h"
-
-/*
- * Implementation of interface class OrgBluezDeviceInterface
- */
-
-OrgBluezDeviceInterface::OrgBluezDeviceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OrgBluezDeviceInterface::~OrgBluezDeviceInterface()
-{
-}
-
diff --git a/src/bluetooth/bluez/device_p.h b/src/bluetooth/bluez/device_p.h
deleted file mode 100644
index 2e1e39ad..00000000
--- a/src/bluetooth/bluez/device_p.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -i servicemap_p.h -p device_p.h:device.cpp org.bluez.Device.xml org.bluez.Device
- *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef DEVICE_P_H
-#define DEVICE_P_H
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-#include "servicemap_p.h"
-
-/*
- * Proxy class for interface org.bluez.Device
- */
-class OrgBluezDeviceInterface: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.bluez.Device"; }
-
-public:
-    OrgBluezDeviceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
-
-    ~OrgBluezDeviceInterface();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<> CancelDiscovery()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("CancelDiscovery"), argumentList);
-    }
-
-    inline QDBusPendingReply<QDBusObjectPath> CreateNode(const QString &in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0);
-        return asyncCallWithArgumentList(QStringLiteral("CreateNode"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Disconnect()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("Disconnect"), argumentList);
-    }
-
-    inline QDBusPendingReply<ServiceMap> DiscoverServices(const QString &in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0);
-        return asyncCallWithArgumentList(QStringLiteral("DiscoverServices"), argumentList);
-    }
-
-    inline QDBusPendingReply<QVariantMap> GetProperties()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("GetProperties"), argumentList);
-    }
-
-    inline QDBusPendingReply<QList<QDBusObjectPath> > ListNodes()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("ListNodes"), argumentList);
-    }
-
-    inline QDBusPendingReply<> RemoveNode(const QDBusObjectPath &in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0);
-        return asyncCallWithArgumentList(QStringLiteral("RemoveNode"), argumentList);
-    }
-
-    inline QDBusPendingReply<> SetProperty(const QString &in0, const QDBusVariant &in1)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1);
-        return asyncCallWithArgumentList(QStringLiteral("SetProperty"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void DisconnectRequested();
-    void NodeCreated(const QDBusObjectPath &in0);
-    void NodeRemoved(const QDBusObjectPath &in0);
-    void PropertyChanged(const QString &in0, const QDBusVariant &in1);
-};
-
-namespace org {
-  namespace bluez {
-    typedef ::OrgBluezDeviceInterface Device;
-  }
-}
-#endif
diff --git a/src/bluetooth/bluez/generate b/src/bluetooth/bluez/generate
index 49397771..20bf1778 100755
--- a/src/bluetooth/bluez/generate
+++ b/src/bluetooth/bluez/generate
@@ -1,11 +1,5 @@
 #!/bin/sh
 
-#Bluez 4
-qdbusxml2cpp -p manager_p.h:manager.cpp org.bluez.Manager.xml org.bluez.Manager
-qdbusxml2cpp -p adapter_p.h:adapter.cpp org.bluez.all.xml org.bluez.Adapter
-qdbusxml2cpp -i servicemap_p.h -p device_p.h:device.cpp org.bluez.Device.xml org.bluez.Device
-qdbusxml2cpp -p service_p.h:service.cpp org.bluez.all.xml org.bluez.Service
-
 #Bluez 5
 qdbusxml2cpp -p adapter1_bluez5_p.h:adapter1_bluez5.cpp org.bluez.Adapter1.xml
 qdbusxml2cpp -i bluez5_helper_p.h -p device1_bluez5_p.h:device1_bluez5.cpp org.bluez.Device1.xml
diff --git a/src/bluetooth/bluez/manager.cpp b/src/bluetooth/bluez/manager.cpp
deleted file mode 100644
index 8ca6fb42..00000000
--- a/src/bluetooth/bluez/manager.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p manager_p.h:manager.cpp org.bluez.Manager.xml org.bluez.Manager
- *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "manager_p.h"
-
-/*
- * Implementation of interface class OrgBluezManagerInterface
- */
-
-OrgBluezManagerInterface::OrgBluezManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OrgBluezManagerInterface::~OrgBluezManagerInterface()
-{
-}
-
diff --git a/src/bluetooth/bluez/manager_p.h b/src/bluetooth/bluez/manager_p.h
deleted file mode 100644
index a969e067..00000000
--- a/src/bluetooth/bluez/manager_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p manager_p.h:manager.cpp org.bluez.Manager.xml org.bluez.Manager
- *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef MANAGER_P_H
-#define MANAGER_P_H
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-
-/*
- * Proxy class for interface org.bluez.Manager
- */
-class OrgBluezManagerInterface: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.bluez.Manager"; }
-
-public:
-    OrgBluezManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
-
-    ~OrgBluezManagerInterface();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<QDBusObjectPath> DefaultAdapter()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("DefaultAdapter"), argumentList);
-    }
-
-    inline QDBusPendingReply<QDBusObjectPath> FindAdapter(const QString &in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0);
-        return asyncCallWithArgumentList(QStringLiteral("FindAdapter"), argumentList);
-    }
-
-    inline QDBusPendingReply<QList<QDBusObjectPath> > ListAdapters()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("ListAdapters"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void AdapterAdded(const QDBusObjectPath &in0);
-    void AdapterRemoved(const QDBusObjectPath &in0);
-    void DefaultAdapterChanged(const QDBusObjectPath &in0);
-};
-
-namespace org {
-  namespace bluez {
-    typedef ::OrgBluezManagerInterface Manager;
-  }
-}
-#endif
diff --git a/src/bluetooth/bluez/org.bluez.Device.xml b/src/bluetooth/bluez/org.bluez.Device.xml
deleted file mode 100644
index 42351c97..00000000
--- a/src/bluetooth/bluez/org.bluez.Device.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/org/bluez/3003/hci0/dev_XX_XX_XX_XX_XX_XX">
-	<interface name="org.bluez.Device">
-        <method name="GetProperties">
-            <arg type="a{sv}" direction="out"/>
-            <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
-        </method>
-        <method name="SetProperty">
-            <arg type="s" direction="in"/>
-            <arg type="v" direction="in"/>
-        </method>
-        <method name="DiscoverServices">
-            <arg type="s" direction="in"/>
-            <arg type="a{us}" direction="out"/>
-            <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="ServiceMap"/>
-        </method>
-        <method name="CancelDiscovery"/>
-        <method name="Disconnect"/>
-        <method name="ListNodes">
-            <arg type="ao" direction="out"/>
-        </method>
-        <method name="CreateNode">
-            <arg type="s" direction="in"/>
-            <arg type="o" direction="out"/>
-        </method>
-        <method name="RemoveNode">
-            <arg type="o" direction="in"/>
-        </method>
-        <signal name="PropertyChanged">
-            <arg type="s"/>
-            <arg type="v"/>
-        </signal>
-        <signal name="DisconnectRequested"/>
-        <signal name="NodeCreated">
-            <arg type="o"/>
-        </signal>
-        <signal name="NodeRemoved">
-            <arg type="o"/>
-        </signal>
-	</interface>
-</node>
diff --git a/src/bluetooth/bluez/org.bluez.Manager.xml b/src/bluetooth/bluez/org.bluez.Manager.xml
deleted file mode 100644
index 60b9baba..00000000
--- a/src/bluetooth/bluez/org.bluez.Manager.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/">
-	<interface name="org.bluez.Manager">
-		<method name="DefaultAdapter">
-			<arg type="o" direction="out"/>
-		</method>
-		<method name="FindAdapter">
-			<arg type="s" direction="in"/>
-			<arg type="o" direction="out"/>
-		</method>
-		<method name="ListAdapters">
-			<arg type="ao" direction="out"/>
-		</method>
-		<signal name="AdapterAdded">
-			<arg type="o"/>
-		</signal>
-		<signal name="AdapterRemoved">
-			<arg type="o"/>
-		</signal>
-		<signal name="DefaultAdapterChanged">
-			<arg type="o"/>
-		</signal>
-	</interface>
-	<node name="org"/>
-</node>
diff --git a/src/bluetooth/bluez/org.bluez.Service.xml b/src/bluetooth/bluez/org.bluez.Service.xml
deleted file mode 100644
index e18516a3..00000000
--- a/src/bluetooth/bluez/org.bluez.Service.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/org/bluez/3003/any">
-	<interface name="org.bluez.Service">
-		<method name="AddRecord">
-			<arg type="s" direction="in"/>
-			<arg type="u" direction="out"/>
-		</method>
-		<method name="UpdateRecord">
-			<arg type="u" direction="in"/>
-			<arg type="s" direction="in"/>
-		</method>
-		<method name="RemoveRecord">
-			<arg type="u" direction="in"/>
-		</method>
-		<method name="RequestAuthorization">
-			<arg type="s" direction="in"/>
-			<arg type="u" direction="in"/>
-		</method>
-		<method name="CancelAuthorization"/>
-	</interface>
-</node>
diff --git a/src/bluetooth/bluez/org.bluez.all.xml b/src/bluetooth/bluez/org.bluez.all.xml
deleted file mode 100644
index b48a01f3..00000000
--- a/src/bluetooth/bluez/org.bluez.all.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/org/bluez/3003/hci0">
-	<interface name="org.bluez.Adapter">
-		<method name="GetProperties">
-			<arg type="a{sv}" direction="out"/>
-            <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
-		</method>
-		<method name="SetProperty">
-			<arg type="s" direction="in"/>
-			<arg type="v" direction="in"/>
-		</method>
-		<method name="RequestMode">
-			<arg type="s" direction="in"/>
-		</method>
-		<method name="ReleaseMode"/>
-		<method name="RequestSession"/>
-		<method name="ReleaseSession"/>
-		<method name="StartDiscovery"/>
-		<method name="StopDiscovery"/>
-		<method name="ListDevices">
-			<arg type="ao" direction="out"/>
-		</method>
-		<method name="CreateDevice">
-			<arg type="s" direction="in"/>
-			<arg type="o" direction="out"/>
-		</method>
-		<method name="CreatePairedDevice">
-			<arg type="s" direction="in"/>
-			<arg type="o" direction="in"/>
-			<arg type="s" direction="in"/>
-			<arg type="o" direction="out"/>
-		</method>
-		<method name="CancelDeviceCreation">
-			<arg type="s" direction="in"/>
-		</method>
-		<method name="RemoveDevice">
-			<arg type="o" direction="in"/>
-		</method>
-		<method name="FindDevice">
-			<arg type="s" direction="in"/>
-			<arg type="o" direction="out"/>
-		</method>
-		<method name="RegisterAgent">
-			<arg type="o" direction="in"/>
-			<arg type="s" direction="in"/>
-		</method>
-		<method name="UnregisterAgent">
-			<arg type="o" direction="in"/>
-		</method>
-		<signal name="DeviceCreated">
-			<arg type="o"/>
-		</signal>
-		<signal name="DeviceRemoved">
-			<arg type="o"/>
-		</signal>
-		<signal name="DeviceFound">
-			<arg type="s"/>
-			<arg type="a{sv}"/>
-            <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QVariantMap"/>
-		</signal>
-		<signal name="PropertyChanged">
-			<arg type="s"/>
-			<arg type="v"/>
-		</signal>
-		<signal name="DeviceDisappeared">
-			<arg type="s"/>
-		</signal>
-	</interface>
-	<interface name="org.bluez.Service">
-		<method name="AddRecord">
-			<arg type="s" direction="in"/>
-			<arg type="u" direction="out"/>
-		</method>
-		<method name="UpdateRecord">
-			<arg type="u" direction="in"/>
-			<arg type="s" direction="in"/>
-		</method>
-		<method name="RemoveRecord">
-			<arg type="u" direction="in"/>
-		</method>
-		<method name="RequestAuthorization">
-			<arg type="s" direction="in"/>
-			<arg type="u" direction="in"/>
-		</method>
-		<method name="CancelAuthorization"/>
-	</interface>
-	<interface name="org.bluez.SerialProxyManager">
-		<method name="CreateProxy">
-			<arg type="s" direction="in"/>
-			<arg type="s" direction="in"/>
-			<arg type="s" direction="out"/>
-		</method>
-		<method name="ListProxies">
-			<arg type="as" direction="out"/>
-		</method>
-		<method name="RemoveProxy">
-			<arg type="s" direction="in"/>
-		</method>
-		<signal name="ProxyCreated">
-			<arg type="s"/>
-		</signal>
-		<signal name="ProxyRemoved">
-			<arg type="s"/>
-		</signal>
-	</interface>
-	<interface name="org.bluez.NetworkPeer">
-		<method name="SetProperty">
-			<arg type="s" direction="in"/>
-			<arg type="v" direction="in"/>
-		</method>
-		<method name="GetProperties">
-			<arg type="a{sv}" direction="out"/>
-		</method>
-		<signal name="PropertyChanged">
-			<arg type="s"/>
-			<arg type="v"/>
-		</signal>
-	</interface>
-	<interface name="org.bluez.NetworkHub">
-		<method name="SetProperty">
-			<arg type="s" direction="in"/>
-			<arg type="v" direction="in"/>
-		</method>
-		<method name="GetProperties">
-			<arg type="a{sv}" direction="out"/>
-		</method>
-		<signal name="PropertyChanged">
-			<arg type="s"/>
-			<arg type="v"/>
-		</signal>
-	</interface>
-	<interface name="org.bluez.NetworkRouter">
-		<method name="SetProperty">
-			<arg type="s" direction="in"/>
-			<arg type="v" direction="in"/>
-		</method>
-		<method name="GetProperties">
-			<arg type="a{sv}" direction="out"/>
-		</method>
-		<signal name="PropertyChanged">
-			<arg type="s"/>
-			<arg type="v"/>
-		</signal>
-	</interface>
-</node>
diff --git a/src/bluetooth/bluez/service.cpp b/src/bluetooth/bluez/service.cpp
deleted file mode 100644
index d2b15fc2..00000000
--- a/src/bluetooth/bluez/service.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p service_p.h:service.cpp org.bluez.all.xml org.bluez.Service
- *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "service_p.h"
-
-/*
- * Implementation of interface class OrgBluezServiceInterface
- */
-
-OrgBluezServiceInterface::OrgBluezServiceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OrgBluezServiceInterface::~OrgBluezServiceInterface()
-{
-}
-
diff --git a/src/bluetooth/bluez/service_p.h b/src/bluetooth/bluez/service_p.h
deleted file mode 100644
index 573265a8..00000000
--- a/src/bluetooth/bluez/service_p.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p service_p.h:service.cpp org.bluez.all.xml org.bluez.Service
- *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef SERVICE_P_H
-#define SERVICE_P_H
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-
-/*
- * Proxy class for interface org.bluez.Service
- */
-class OrgBluezServiceInterface: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.bluez.Service"; }
-
-public:
-    OrgBluezServiceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
-
-    ~OrgBluezServiceInterface();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<uint> AddRecord(const QString &in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0);
-        return asyncCallWithArgumentList(QStringLiteral("AddRecord"), argumentList);
-    }
-
-    inline QDBusPendingReply<> CancelAuthorization()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("CancelAuthorization"), argumentList);
-    }
-
-    inline QDBusPendingReply<> RemoveRecord(uint in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0);
-        return asyncCallWithArgumentList(QStringLiteral("RemoveRecord"), argumentList);
-    }
-
-    inline QDBusPendingReply<> RequestAuthorization(const QString &in0, uint in1)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1);
-        return asyncCallWithArgumentList(QStringLiteral("RequestAuthorization"), argumentList);
-    }
-
-    inline QDBusPendingReply<> UpdateRecord(uint in0, const QString &in1)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1);
-        return asyncCallWithArgumentList(QStringLiteral("UpdateRecord"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-};
-
-namespace org {
-  namespace bluez {
-    typedef ::OrgBluezServiceInterface Service;
-  }
-}
-#endif
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
index 6208d7a8..897f2383 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
@@ -43,9 +43,6 @@
 #include "qbluetoothaddress.h"
 #include "qbluetoothuuid.h"
 
-#include "bluez/manager_p.h"
-#include "bluez/adapter_p.h"
-#include "bluez/device_p.h"
 #include "bluez/bluez5_helper_p.h"
 #include "bluez/objectmanager_p.h"
 #include "bluez/adapter1_bluez5_p.h"
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
index 504f25db..57480ff9 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
@@ -40,9 +40,6 @@
 #include "qbluetoothservicediscoveryagent.h"
 #include "qbluetoothservicediscoveryagent_p.h"
 
-#include "bluez/manager_p.h"
-#include "bluez/adapter_p.h"
-#include "bluez/device_p.h"
 #include "bluez/bluez5_helper_p.h"
 #include "bluez/objectmanager_p.h"
 #include "bluez/adapter1_bluez5_p.h"
diff --git a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp
index dbc0bccb..091676cd 100644
--- a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp
+++ b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp
@@ -40,8 +40,6 @@
 #include "qbluetoothserviceinfo.h"
 #include "qbluetoothserviceinfo_p.h"
 
-#include "bluez/manager_p.h"
-#include "bluez/service_p.h"
 #include "bluez/bluez5_helper_p.h"
 #include "bluez/profilemanager1_p.h"
 
diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp
index 28f1c2a5..8b83442b 100644
--- a/src/bluetooth/qbluetoothsocket_bluez.cpp
+++ b/src/bluetooth/qbluetoothsocket_bluez.cpp
@@ -41,9 +41,6 @@
 #include "qbluetoothsocket_bluez_p.h"
 #include "qbluetoothdeviceinfo.h"
 
-#include "bluez/manager_p.h"
-#include "bluez/adapter_p.h"
-#include "bluez/device_p.h"
 #include "bluez/objectmanager_p.h"
 #include <QtBluetooth/QBluetoothLocalDevice>
 #include "bluez/bluez_data_p.h"
diff --git a/src/bluetooth/qlowenergycontroller_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp
index cdb482a9..aa409a31 100644
--- a/src/bluetooth/qlowenergycontroller_bluez.cpp
+++ b/src/bluetooth/qlowenergycontroller_bluez.cpp
@@ -50,11 +50,6 @@
 #include "bluez/bluez5_helper_p.h"
 #include "bluez/bluetoothmanagement_p.h"
 
-// Bluez 4
-#include "bluez/adapter_p.h"
-#include "bluez/device_p.h"
-#include "bluez/manager_p.h"
-
 #include <QtCore/QFileInfo>
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QSettings>