bluez dbus files: adapt the generate script to recent changes

... and re-generate

We're now supposed to include the qglobal_p.h file in every _p.h file,
so pass that as an (additional) -i to qdbusxml2cpp. To DRY, wrap that
in a function.

There were some changes that I had to remove after the script ran:

- qdbusxml2cpp tries to generate properties called 'class', which have
  been renamed to 'classProperty' in the checked-in files, and I left
  it as such, for obvious reasons.

- The PropertiesChanged() signal in the newly-generated properties_p.h
  is missing the trailing QDBusMessage parameter, compared to the
  checked-in version. The slot connected to the signal uses the
  argument, with no obvious (to this author) way to get the info
  elsewhere.

The includes generated from -i options always use "", not <>, so I
guess we need to live with that, or fix qdbusxml2cpp.

Task-number: QTBUG-103207
Task-number: QTBUG-103313
Change-Id: Ifee3e74126e9a4fc72e6040d667aa2bb85bbd768
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi>

21 files changed, 85 insertions, 69 deletions

diff --git a/src/bluetooth/bluez/adapter1_bluez5.cpp b/src/bluetooth/bluez/adapter1_bluez5.cpp
index b1aefc8d..283a1c1e 100644
--- a/src/bluetooth/bluez/adapter1_bluez5.cpp
+++ b/src/bluetooth/bluez/adapter1_bluez5.cpp
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p adapter1_bluez5_p.h:adapter1_bluez5.cpp org.bluez.Adapter1.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p adapter1_bluez5_p.h:adapter1_bluez5.cpp org.bluez.Adapter1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/adapter1_bluez5_p.h b/src/bluetooth/bluez/adapter1_bluez5_p.h
index f5ce4da2..6a161b7b 100644
--- a/src/bluetooth/bluez/adapter1_bluez5_p.h
+++ b/src/bluetooth/bluez/adapter1_bluez5_p.h
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p adapter1_bluez5_p.h:adapter1_bluez5.cpp org.bluez.Adapter1.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p adapter1_bluez5_p.h:adapter1_bluez5.cpp org.bluez.Adapter1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -19,7 +19,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
-#include <QtCore/private/qglobal_p.h>
+#include "QtCore/private/qglobal_p.h"
 
 /*
  * Proxy class for interface org.bluez.Adapter1
@@ -128,7 +128,7 @@ Q_SIGNALS: // SIGNALS
 
 namespace org {
   namespace bluez {
-    typedef ::OrgBluezAdapter1Interface Adapter1;
+    using Adapter1 = ::OrgBluezAdapter1Interface;
   }
 }
 #endif
diff --git a/src/bluetooth/bluez/battery1.cpp b/src/bluetooth/bluez/battery1.cpp
index f23cc205..9ee560c6 100644
--- a/src/bluetooth/bluez/battery1.cpp
+++ b/src/bluetooth/bluez/battery1.cpp
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p battery1_p.h:battery1.cpp org.bluez.Battery1.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p battery1_p.h:battery1.cpp org.bluez.Battery1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2018 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/battery1_p.h b/src/bluetooth/bluez/battery1_p.h
index 40807c7f..9efe3361 100644
--- a/src/bluetooth/bluez/battery1_p.h
+++ b/src/bluetooth/bluez/battery1_p.h
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p battery1_p.h:battery1.cpp org.bluez.Battery1.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p battery1_p.h:battery1.cpp org.bluez.Battery1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2018 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -19,7 +19,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
-#include <QtCore/private/qglobal_p.h>
+#include "QtCore/private/qglobal_p.h"
 
 /*
  * Proxy class for interface org.bluez.Battery1
@@ -46,7 +46,7 @@ Q_SIGNALS: // SIGNALS
 
 namespace org {
   namespace bluez {
-    typedef ::OrgBluezBattery1Interface Battery1;
+    using Battery1 = ::OrgBluezBattery1Interface;
   }
 }
 #endif
diff --git a/src/bluetooth/bluez/device1_bluez5.cpp b/src/bluetooth/bluez/device1_bluez5.cpp
index cd6453ad..681c733a 100644
--- a/src/bluetooth/bluez/device1_bluez5.cpp
+++ b/src/bluetooth/bluez/device1_bluez5.cpp
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p device1_bluez5_p.h:device1_bluez5.cpp org.bluez.Device1.xml
+ * Command line was: qdbusxml2cpp -i bluez5_helper_p.h -i QtCore/private/qglobal_p.h -p device1_bluez5_p.h:device1_bluez5.cpp org.bluez.Device1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/device1_bluez5_p.h b/src/bluetooth/bluez/device1_bluez5_p.h
index c03a1bd8..aebad2ca 100644
--- a/src/bluetooth/bluez/device1_bluez5_p.h
+++ b/src/bluetooth/bluez/device1_bluez5_p.h
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p device1_bluez5_p.h:device1_bluez5.cpp org.bluez.Device1.xml
+ * Command line was: qdbusxml2cpp -i bluez5_helper_p.h -i QtCore/private/qglobal_p.h -p device1_bluez5_p.h:device1_bluez5.cpp org.bluez.Device1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -20,6 +20,7 @@
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
 #include "bluez5_helper_p.h"
+#include "QtCore/private/qglobal_p.h"
 
 /*
  * Proxy class for interface org.bluez.Device1
@@ -162,7 +163,7 @@ Q_SIGNALS: // SIGNALS
 
 namespace org {
   namespace bluez {
-    typedef ::OrgBluezDevice1Interface Device1;
+    using Device1 = ::OrgBluezDevice1Interface;
   }
 }
 #endif
diff --git a/src/bluetooth/bluez/gattchar1.cpp b/src/bluetooth/bluez/gattchar1.cpp
index cdb3fc0d..06d739e1 100644
--- a/src/bluetooth/bluez/gattchar1.cpp
+++ b/src/bluetooth/bluez/gattchar1.cpp
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p gattchar1_p.h:gattchar1.cpp org.bluez.GattCharacteristic1.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p gattchar1_p.h:gattchar1.cpp org.bluez.GattCharacteristic1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/gattchar1_p.h b/src/bluetooth/bluez/gattchar1_p.h
index 51066653..4c0240e3 100644
--- a/src/bluetooth/bluez/gattchar1_p.h
+++ b/src/bluetooth/bluez/gattchar1_p.h
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p gattchar1_p.h:gattchar1.cpp org.bluez.GattCharacteristic1.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p gattchar1_p.h:gattchar1.cpp org.bluez.GattCharacteristic1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -19,7 +19,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
-#include <QtCore/private/qglobal_p.h>
+#include "QtCore/private/qglobal_p.h"
 
 /*
  * Proxy class for interface org.bluez.GattCharacteristic1
@@ -88,7 +88,7 @@ Q_SIGNALS: // SIGNALS
 
 namespace org {
   namespace bluez {
-    typedef ::OrgBluezGattCharacteristic1Interface GattCharacteristic1;
+    using GattCharacteristic1 = ::OrgBluezGattCharacteristic1Interface;
   }
 }
 #endif
diff --git a/src/bluetooth/bluez/gattdesc1.cpp b/src/bluetooth/bluez/gattdesc1.cpp
index 8447e49b..d3f0aa63 100644
--- a/src/bluetooth/bluez/gattdesc1.cpp
+++ b/src/bluetooth/bluez/gattdesc1.cpp
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p gattdesc1_p.h:gattdesc1.cpp org.bluez.GattDescriptor1.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p gattdesc1_p.h:gattdesc1.cpp org.bluez.GattDescriptor1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/gattdesc1_p.h b/src/bluetooth/bluez/gattdesc1_p.h
index 5323b7fb..28065541 100644
--- a/src/bluetooth/bluez/gattdesc1_p.h
+++ b/src/bluetooth/bluez/gattdesc1_p.h
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p gattdesc1_p.h:gattdesc1.cpp org.bluez.GattDescriptor1.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p gattdesc1_p.h:gattdesc1.cpp org.bluez.GattDescriptor1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -19,7 +19,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
-#include <QtCore/private/qglobal_p.h>
+#include "QtCore/private/qglobal_p.h"
 
 /*
  * Proxy class for interface org.bluez.GattDescriptor1
@@ -68,7 +68,7 @@ Q_SIGNALS: // SIGNALS
 
 namespace org {
   namespace bluez {
-    typedef ::OrgBluezGattDescriptor1Interface GattDescriptor1;
+    using GattDescriptor1 = ::OrgBluezGattDescriptor1Interface;
   }
 }
 #endif
diff --git a/src/bluetooth/bluez/gattservice1.cpp b/src/bluetooth/bluez/gattservice1.cpp
index 0b80ac90..e903eb80 100644
--- a/src/bluetooth/bluez/gattservice1.cpp
+++ b/src/bluetooth/bluez/gattservice1.cpp
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p gattservice1_p.h:gattservice1.cpp org.bluez.GattService1.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p gattservice1_p.h:gattservice1.cpp org.bluez.GattService1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/gattservice1_p.h b/src/bluetooth/bluez/gattservice1_p.h
index 4c12c4e2..5f6908f2 100644
--- a/src/bluetooth/bluez/gattservice1_p.h
+++ b/src/bluetooth/bluez/gattservice1_p.h
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p gattservice1_p.h:gattservice1.cpp org.bluez.GattService1.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p gattservice1_p.h:gattservice1.cpp org.bluez.GattService1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -19,7 +19,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
-#include <QtCore/private/qglobal_p.h>
+#include "QtCore/private/qglobal_p.h"
 
 /*
  * Proxy class for interface org.bluez.GattService1
@@ -58,7 +58,7 @@ Q_SIGNALS: // SIGNALS
 
 namespace org {
   namespace bluez {
-    typedef ::OrgBluezGattService1Interface GattService1;
+    using GattService1 = ::OrgBluezGattService1Interface;
   }
 }
 #endif
diff --git a/src/bluetooth/bluez/generate b/src/bluetooth/bluez/generate
index 20bf1778..11bc6e7b 100755
--- a/src/bluetooth/bluez/generate
+++ b/src/bluetooth/bluez/generate
@@ -1,14 +1,29 @@
 #!/bin/sh
 
+QGLOBAL_P_H=QtCore/private/qglobal_p.h
+
+process() {
+    CPP_BASENAME=$1
+    shift
+    XML_FILE="$1"
+    shift
+
+    HEADER_FILE=${CPP_BASENAME}_p.h
+    CPP_FILE=${CPP_BASENAME}.cpp
+    qdbusxml2cpp "$@" -i "$QGLOBAL_P_H" -p $HEADER_FILE:$CPP_FILE "$XML_FILE"
+}
+
 #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
-qdbusxml2cpp -p profilemanager1_p.h:profilemanager1.cpp org.bluez.ProfileManager1.xml
-qdbusxml2cpp -p profile1_p.h:profile1.cpp org.bluez.Profile1.xml
-qdbusxml2cpp -i bluez5_helper_p.h -p objectmanager_p.h:objectmanager.cpp org.freedesktop.dbus.objectmanager.xml
-qdbusxml2cpp -p properties_p.h:properties.cpp org.freedesktop.dbus.properties.xml
-qdbusxml2cpp -p gattchar1_p.h:gattchar1.cpp org.bluez.GattCharacteristic1.xml
-qdbusxml2cpp -p gattdesc1_p.h:gattdesc1.cpp org.bluez.GattDescriptor1.xml
-qdbusxml2cpp -p gattservice1_p.h:gattservice1.cpp org.bluez.GattService1.xml
-qdbusxml2cpp -p battery1_p.h:battery1.cpp org.bluez.Battery1.xml
+process adapter1_bluez5  org.bluez.Adapter1.xml
+process device1_bluez5   org.bluez.Device1.xml -i bluez5_helper_p.h
+process profilemanager1  org.bluez.ProfileManager1.xml
+process profile1         org.bluez.Profile1.xml
+
+process objectmanager    org.freedesktop.dbus.objectmanager.xml -i bluez5_helper_p.h
+process properties       org.freedesktop.dbus.properties.xml
+
+process gattchar1        org.bluez.GattCharacteristic1.xml
+process gattdesc1        org.bluez.GattDescriptor1.xml
+process gattservice1     org.bluez.GattService1.xml
+process battery1         org.bluez.Battery1.xml
 
diff --git a/src/bluetooth/bluez/objectmanager.cpp b/src/bluetooth/bluez/objectmanager.cpp
index 4484ea27..896bd773 100644
--- a/src/bluetooth/bluez/objectmanager.cpp
+++ b/src/bluetooth/bluez/objectmanager.cpp
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p objectmanager_p.h:objectmanager.cpp org.freedesktop.dbus.objectmanager.xml
+ * Command line was: qdbusxml2cpp -i bluez5_helper_p.h -i QtCore/private/qglobal_p.h -p objectmanager_p.h:objectmanager.cpp org.freedesktop.dbus.objectmanager.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/objectmanager_p.h b/src/bluetooth/bluez/objectmanager_p.h
index 7aa2f35b..d0db27d2 100644
--- a/src/bluetooth/bluez/objectmanager_p.h
+++ b/src/bluetooth/bluez/objectmanager_p.h
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p objectmanager_p.h:objectmanager.cpp org.freedesktop.dbus.objectmanager.xml
+ * Command line was: qdbusxml2cpp -i bluez5_helper_p.h -i QtCore/private/qglobal_p.h -p objectmanager_p.h:objectmanager.cpp org.freedesktop.dbus.objectmanager.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -19,8 +19,8 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
-
 #include "bluez5_helper_p.h"
+#include "QtCore/private/qglobal_p.h"
 
 /*
  * Proxy class for interface org.freedesktop.DBus.ObjectManager
@@ -52,7 +52,7 @@ Q_SIGNALS: // SIGNALS
 namespace org {
   namespace freedesktop {
     namespace DBus {
-      typedef ::OrgFreedesktopDBusObjectManagerInterface ObjectManager;
+      using ObjectManager = ::OrgFreedesktopDBusObjectManagerInterface;
     }
   }
 }
diff --git a/src/bluetooth/bluez/profile1.cpp b/src/bluetooth/bluez/profile1.cpp
index e74be807..91711ba9 100644
--- a/src/bluetooth/bluez/profile1.cpp
+++ b/src/bluetooth/bluez/profile1.cpp
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p profile1_p.h:profile1.cpp org.bluez.Profile1.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p profile1_p.h:profile1.cpp org.bluez.Profile1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2018 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/profile1_p.h b/src/bluetooth/bluez/profile1_p.h
index 586f11a6..dfba04c7 100644
--- a/src/bluetooth/bluez/profile1_p.h
+++ b/src/bluetooth/bluez/profile1_p.h
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p profile1_p.h:profile1.cpp org.bluez.Profile1.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p profile1_p.h:profile1.cpp org.bluez.Profile1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2018 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -19,7 +19,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
-#include <QtCore/private/qglobal_p.h>
+#include "QtCore/private/qglobal_p.h"
 
 /*
  * Proxy class for interface org.bluez.Profile1
@@ -62,7 +62,7 @@ Q_SIGNALS: // SIGNALS
 
 namespace org {
   namespace bluez {
-    typedef ::OrgBluezProfile1Interface Profile1;
+    using Profile1 = ::OrgBluezProfile1Interface;
   }
 }
 #endif
diff --git a/src/bluetooth/bluez/profilemanager1.cpp b/src/bluetooth/bluez/profilemanager1.cpp
index fe685c63..f5ac93ec 100644
--- a/src/bluetooth/bluez/profilemanager1.cpp
+++ b/src/bluetooth/bluez/profilemanager1.cpp
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p profilemanager1_p.h:profilemanager1.cpp org.bluez.ProfileManager1.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p profilemanager1_p.h:profilemanager1.cpp org.bluez.ProfileManager1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/profilemanager1_p.h b/src/bluetooth/bluez/profilemanager1_p.h
index 6b3d7158..508910df 100644
--- a/src/bluetooth/bluez/profilemanager1_p.h
+++ b/src/bluetooth/bluez/profilemanager1_p.h
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p profilemanager1_p.h:profilemanager1.cpp org.bluez.ProfileManager1.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p profilemanager1_p.h:profilemanager1.cpp org.bluez.ProfileManager1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -19,7 +19,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
-#include <QtCore/private/qglobal_p.h>
+#include "QtCore/private/qglobal_p.h"
 
 /*
  * Proxy class for interface org.bluez.ProfileManager1
@@ -56,7 +56,7 @@ Q_SIGNALS: // SIGNALS
 
 namespace org {
   namespace bluez {
-    typedef ::OrgBluezProfileManager1Interface ProfileManager1;
+    using ProfileManager1 = ::OrgBluezProfileManager1Interface;
   }
 }
 #endif
diff --git a/src/bluetooth/bluez/properties.cpp b/src/bluetooth/bluez/properties.cpp
index 1c10bfdc..8688afb0 100644
--- a/src/bluetooth/bluez/properties.cpp
+++ b/src/bluetooth/bluez/properties.cpp
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p properties_p.h:properties.cpp org.freedesktop.dbus.properties.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p properties_p.h:properties.cpp org.freedesktop.dbus.properties.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/properties_p.h b/src/bluetooth/bluez/properties_p.h
index 611ef684..7d8cc5f9 100644
--- a/src/bluetooth/bluez/properties_p.h
+++ b/src/bluetooth/bluez/properties_p.h
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p properties_p.h:properties.cpp org.freedesktop.dbus.properties.xml
+ * Command line was: qdbusxml2cpp -i QtCore/private/qglobal_p.h -p properties_p.h:properties.cpp org.freedesktop.dbus.properties.xml
  *
- * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -19,7 +19,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
-#include <QtCore/private/qglobal_p.h>
+#include "QtCore/private/qglobal_p.h"
 
 /*
  * Proxy class for interface org.freedesktop.DBus.Properties
@@ -66,7 +66,7 @@ Q_SIGNALS: // SIGNALS
 namespace org {
   namespace freedesktop {
     namespace DBus {
-      typedef ::OrgFreedesktopDBusPropertiesInterface Properties;
+      using Properties = ::OrgFreedesktopDBusPropertiesInterface;
     }
   }
 }