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-04 15:36:58 +0000 |
| commit | bc07549c1b93b275be93f915c433a22c66188e60 (patch) | |
| tree | f9b23aa679c3dc06eea48d4b5ea9b2044c186f35 | |
| parent | 42a995c1e680e7fe13175146b831a322e1c77781 (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.
Pick-to: 6.3 6.2 5.15
Change-Id: Idc9cabcf24b8f639e6e2b9e25f8c92ce10198e8a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi>
| -rw-r--r-- | src/bluetooth/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/bluetooth/qleadvertiser_bluez.cpp | 2 | ||||
| -rw-r--r-- | src/bluetooth/qleadvertiser_bluez_p.h (renamed from src/bluetooth/qleadvertiser_p.h) | 11 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_bluez.cpp | 2 |
4 files changed, 7 insertions, 11 deletions
diff --git a/src/bluetooth/CMakeLists.txt b/src/bluetooth/CMakeLists.txt index f6736f98..909a26f4 100644 --- a/src/bluetooth/CMakeLists.txt +++ b/src/bluetooth/CMakeLists.txt @@ -17,7 +17,6 @@ qt_internal_add_module(Bluetooth qbluetoothsocket.cpp qbluetoothsocket.h qbluetoothsocketbase.cpp qbluetoothsocketbase_p.h qbluetoothuuid.cpp qbluetoothuuid.h - qleadvertiser_p.h qlowenergyadvertisingdata.cpp qlowenergyadvertisingdata.h qlowenergyadvertisingparameters.cpp qlowenergyadvertisingparameters.h qlowenergycharacteristic.cpp qlowenergycharacteristic.h @@ -88,7 +87,7 @@ if(QT_FEATURE_bluez) qt_internal_extend_target(Bluetooth SOURCES lecmaccalculator.cpp - qleadvertiser_bluez.cpp + qleadvertiser_bluez.cpp qleadvertiser_bluez_p.h qlowenergycontroller_bluez.cpp qlowenergycontroller_bluez_p.h qlowenergycontroller_bluezdbus.cpp qlowenergycontroller_bluezdbus_p.h ) diff --git a/src/bluetooth/qleadvertiser_bluez.cpp b/src/bluetooth/qleadvertiser_bluez.cpp index 5072a461..66ee314c 100644 --- a/src/bluetooth/qleadvertiser_bluez.cpp +++ b/src/bluetooth/qleadvertiser_bluez.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "qleadvertiser_p.h" +#include "qleadvertiser_bluez_p.h" #include "bluez/bluez_data_p.h" #include "bluez/hcimanager_p.h" diff --git a/src/bluetooth/qleadvertiser_p.h b/src/bluetooth/qleadvertiser_bluez_p.h index 43b40f40..b0bc912f 100644 --- a/src/bluetooth/qleadvertiser_p.h +++ b/src/bluetooth/qleadvertiser_bluez_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QLEADVERTISER_P_H -#define QLEADVERTISER_P_H +#ifndef QLEADVERTISER_BLUEZ_P_H +#define QLEADVERTISER_BLUEZ_P_H // // W A R N I N G @@ -54,9 +54,9 @@ #include "qlowenergyadvertisingdata.h" #include "qlowenergyadvertisingparameters.h" -#if QT_CONFIG(bluez) +QT_REQUIRE_CONFIG(bluez); + #include "bluez/bluez_data_p.h" -#endif #include <QtCore/qlist.h> #include <QtCore/qobject.h> @@ -94,8 +94,6 @@ private: const QLowEnergyAdvertisingData m_responseData; }; - -#if QT_CONFIG(bluez) struct AdvData; struct AdvParams; class HciManager; @@ -147,7 +145,6 @@ private: quint8 m_powerLevel; bool m_sendPowerLevel; }; -#endif // QT_CONFIG(bluez) QT_END_NAMESPACE diff --git a/src/bluetooth/qlowenergycontroller_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp index 8895e773..27e1c674 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" |