diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-07-27 17:11:05 -0700 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-28 14:23:35 +0000 |
| commit | 016708ab60304493c864986eee7a457a32c67f60 (patch) | |
| tree | 8934f47873fb5390f9c4311fa438107a19765799 | |
| parent | 3e32c15dc2010bcb21ed314c3d50f01f4c3e52b2 (diff) | |
Fix several more improperly placed #include moc
Like commit qtbase/638893bea083b619b73b33a7dd5589fb2c4c4242.
Script to find them:
git grep -l '#include.*moc' \*.cpp \*.mm | \
xargs awk '/QT_BEGIN_NAMESPACE/ { i=1 } /QT_END_NAMESPACE/ { i=0 } /#include.*moc/ && i { print ARGV[ARGIND], $0 }'
Change-Id: I6f936da6f6e84d649f70fffd17058fd05cfc5c6d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit a27868032b5f84193b23435d2bc87b94320206b3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_bluez.cpp | 4 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_winrt.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp index 3b2cf9ce..42e45b48 100644 --- a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp @@ -683,6 +683,6 @@ void QBluetoothLocalDevicePrivate::pairingCompleted(QDBusPendingCallWatcher *wat watcher->deleteLater(); } -#include "moc_qbluetoothlocaldevice_p.cpp" - QT_END_NAMESPACE + +#include "moc_qbluetoothlocaldevice_p.cpp" diff --git a/src/bluetooth/qbluetoothlocaldevice_winrt.cpp b/src/bluetooth/qbluetoothlocaldevice_winrt.cpp index 06fb5340..72cc4e6a 100644 --- a/src/bluetooth/qbluetoothlocaldevice_winrt.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_winrt.cpp @@ -793,6 +793,6 @@ QList<QBluetoothHostInfo> QBluetoothLocalDevice::allDevices() return devices; } -#include "qbluetoothlocaldevice_winrt.moc" - QT_END_NAMESPACE + +#include "qbluetoothlocaldevice_winrt.moc" |