diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-05-03 17:30:45 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-05-09 18:53:05 +0000 |
| commit | 90cadc43d17ad4b4986fa75449af422979089426 (patch) | |
| tree | 006f944bfa5ee5209a615f38736b979cb5dc2fe3 /src/bluetooth/qlowenergycontroller_bluez.cpp | |
| parent | f073954fdc07c4e4599314dd4a47cef27bf3f538 (diff) | |
Rename qleadvertiser_p.h → qleadvertiser_bluez_p.h
It's only used by the bluez code, so a) let the name reflect that (as
the .cpp file already did) and b) remove the header from non-bluez
builds.
Manual conflict resolutions:
- port from cmake to qmake
Change-Id: Idc9cabcf24b8f639e6e2b9e25f8c92ce10198e8a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi>
(cherry picked from commit bc07549c1b93b275be93f915c433a22c66188e60)
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src/bluetooth/qlowenergycontroller_bluez.cpp')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_bluez.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/qlowenergycontroller_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp index aab6df12..bc802f34 100644 --- a/src/bluetooth/qlowenergycontroller_bluez.cpp +++ b/src/bluetooth/qlowenergycontroller_bluez.cpp @@ -42,7 +42,7 @@ #include "qlowenergycontroller_bluez_p.h" #include "qbluetoothsocketbase_p.h" #include "qbluetoothsocket_bluez_p.h" -#include "qleadvertiser_p.h" +#include "qleadvertiser_bluez_p.h" #include "bluez/bluez_data_p.h" #include "bluez/hcimanager_p.h" #include "bluez/objectmanager_p.h" |