diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-05-06 13:02:54 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-05-11 05:00:05 +0000 |
commit | a354afb79e239ed499569029dc912221119faba0 (patch) | |
tree | 8ca2c423df0fe87d42c19475e3b74ed13ef886a2 /src | |
parent | 750af7149adbb2087963e5e4237158f87ae8b76f (diff) |
bluez dbus files: work around qdbusxml2cpp's inability to includemocs
Since we generate these files using a script, anyway, and until
qdbusxml2cpp learns how to do it automatically, just append the
moc-files manually.
Task-number: QTBUG-103313
Task-number: QTBUG-103207
Change-Id: Ia8b95981029cdc65ee513e6fd1acfbf1aac4e006
Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi>
Diffstat (limited to 'src')
-rw-r--r-- | src/bluetooth/bluez/adapter1_bluez5.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/bluez/battery1.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/bluez/device1_bluez5.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/bluez/gattchar1.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/bluez/gattdesc1.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/bluez/gattservice1.cpp | 2 | ||||
-rwxr-xr-x | src/bluetooth/bluez/generate | 5 | ||||
-rw-r--r-- | src/bluetooth/bluez/objectmanager.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/bluez/profile1.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/bluez/profilemanager1.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/bluez/properties.cpp | 2 |
11 files changed, 25 insertions, 0 deletions
diff --git a/src/bluetooth/bluez/adapter1_bluez5.cpp b/src/bluetooth/bluez/adapter1_bluez5.cpp index 283a1c1e..1d2ab98d 100644 --- a/src/bluetooth/bluez/adapter1_bluez5.cpp +++ b/src/bluetooth/bluez/adapter1_bluez5.cpp @@ -24,3 +24,5 @@ OrgBluezAdapter1Interface::~OrgBluezAdapter1Interface() { } + +#include "moc_adapter1_bluez5_p.cpp" diff --git a/src/bluetooth/bluez/battery1.cpp b/src/bluetooth/bluez/battery1.cpp index 9ee560c6..45b0fbde 100644 --- a/src/bluetooth/bluez/battery1.cpp +++ b/src/bluetooth/bluez/battery1.cpp @@ -24,3 +24,5 @@ OrgBluezBattery1Interface::~OrgBluezBattery1Interface() { } + +#include "moc_battery1_p.cpp" diff --git a/src/bluetooth/bluez/device1_bluez5.cpp b/src/bluetooth/bluez/device1_bluez5.cpp index 681c733a..be6b0d7d 100644 --- a/src/bluetooth/bluez/device1_bluez5.cpp +++ b/src/bluetooth/bluez/device1_bluez5.cpp @@ -24,3 +24,5 @@ OrgBluezDevice1Interface::~OrgBluezDevice1Interface() { } + +#include "moc_device1_bluez5_p.cpp" diff --git a/src/bluetooth/bluez/gattchar1.cpp b/src/bluetooth/bluez/gattchar1.cpp index 06d739e1..f74bd18a 100644 --- a/src/bluetooth/bluez/gattchar1.cpp +++ b/src/bluetooth/bluez/gattchar1.cpp @@ -24,3 +24,5 @@ OrgBluezGattCharacteristic1Interface::~OrgBluezGattCharacteristic1Interface() { } + +#include "moc_gattchar1_p.cpp" diff --git a/src/bluetooth/bluez/gattdesc1.cpp b/src/bluetooth/bluez/gattdesc1.cpp index d3f0aa63..6d35d44c 100644 --- a/src/bluetooth/bluez/gattdesc1.cpp +++ b/src/bluetooth/bluez/gattdesc1.cpp @@ -24,3 +24,5 @@ OrgBluezGattDescriptor1Interface::~OrgBluezGattDescriptor1Interface() { } + +#include "moc_gattdesc1_p.cpp" diff --git a/src/bluetooth/bluez/gattservice1.cpp b/src/bluetooth/bluez/gattservice1.cpp index e903eb80..ee4657e0 100644 --- a/src/bluetooth/bluez/gattservice1.cpp +++ b/src/bluetooth/bluez/gattservice1.cpp @@ -24,3 +24,5 @@ OrgBluezGattService1Interface::~OrgBluezGattService1Interface() { } + +#include "moc_gattservice1_p.cpp" diff --git a/src/bluetooth/bluez/generate b/src/bluetooth/bluez/generate index 11bc6e7b..9e984779 100755 --- a/src/bluetooth/bluez/generate +++ b/src/bluetooth/bluez/generate @@ -11,6 +11,11 @@ process() { HEADER_FILE=${CPP_BASENAME}_p.h CPP_FILE=${CPP_BASENAME}.cpp qdbusxml2cpp "$@" -i "$QGLOBAL_P_H" -p $HEADER_FILE:$CPP_FILE "$XML_FILE" + + # until QTBUG-103313 is fixed: + MOC_FILE=moc_${CPP_BASENAME}_p.cpp + echo >> "$CPP_FILE" + echo "#include \"$MOC_FILE\"" >> "$CPP_FILE" } #Bluez 5 diff --git a/src/bluetooth/bluez/objectmanager.cpp b/src/bluetooth/bluez/objectmanager.cpp index 896bd773..ffa75196 100644 --- a/src/bluetooth/bluez/objectmanager.cpp +++ b/src/bluetooth/bluez/objectmanager.cpp @@ -24,3 +24,5 @@ OrgFreedesktopDBusObjectManagerInterface::~OrgFreedesktopDBusObjectManagerInterf { } + +#include "moc_objectmanager_p.cpp" diff --git a/src/bluetooth/bluez/profile1.cpp b/src/bluetooth/bluez/profile1.cpp index 91711ba9..a5bfd0c3 100644 --- a/src/bluetooth/bluez/profile1.cpp +++ b/src/bluetooth/bluez/profile1.cpp @@ -24,3 +24,5 @@ OrgBluezProfile1Interface::~OrgBluezProfile1Interface() { } + +#include "moc_profile1_p.cpp" diff --git a/src/bluetooth/bluez/profilemanager1.cpp b/src/bluetooth/bluez/profilemanager1.cpp index f5ac93ec..ac4d158c 100644 --- a/src/bluetooth/bluez/profilemanager1.cpp +++ b/src/bluetooth/bluez/profilemanager1.cpp @@ -24,3 +24,5 @@ OrgBluezProfileManager1Interface::~OrgBluezProfileManager1Interface() { } + +#include "moc_profilemanager1_p.cpp" diff --git a/src/bluetooth/bluez/properties.cpp b/src/bluetooth/bluez/properties.cpp index 8688afb0..697269f3 100644 --- a/src/bluetooth/bluez/properties.cpp +++ b/src/bluetooth/bluez/properties.cpp @@ -24,3 +24,5 @@ OrgFreedesktopDBusPropertiesInterface::~OrgFreedesktopDBusPropertiesInterface() { } + +#include "moc_properties_p.cpp" |