summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-05-03 17:41:58 +0200
committerMarc Mutz <marc.mutz@qt.io>2022-05-04 17:37:23 +0200
commit458f7d8d27713ef9ac1941b03b8961462e7afbe8 (patch)
tree124fc7a172204d668f5bd7ac0053175e8ee3c270
parent3f7cf949375458bc614c9961a44bfc712ed84872 (diff)
De-inline QLeAdvertizer dtor
Destructors of polymorphic classes should be out-of-line to pin vtable and type_info objects to a single TU. Task-number: QTBUG-45582 Change-Id: I54bd07330b41490af6b6696bc6c3c4ed5da29d2a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
-rw-r--r--src/bluetooth/qleadvertiser_bluez.cpp3
-rw-r--r--src/bluetooth/qleadvertiser_bluez_p.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/bluetooth/qleadvertiser_bluez.cpp b/src/bluetooth/qleadvertiser_bluez.cpp
index 22d77ee8..e23552a7 100644
--- a/src/bluetooth/qleadvertiser_bluez.cpp
+++ b/src/bluetooth/qleadvertiser_bluez.cpp
@@ -51,6 +51,9 @@ QT_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(QT_BT_BLUEZ)
+QLeAdvertiser::~QLeAdvertiser()
+ = default;
+
struct AdvParams {
quint16 minInterval;
quint16 maxInterval;
diff --git a/src/bluetooth/qleadvertiser_bluez_p.h b/src/bluetooth/qleadvertiser_bluez_p.h
index b0bc912f..d9e8a78b 100644
--- a/src/bluetooth/qleadvertiser_bluez_p.h
+++ b/src/bluetooth/qleadvertiser_bluez_p.h
@@ -78,7 +78,7 @@ public:
const QLowEnergyAdvertisingData &advData,
const QLowEnergyAdvertisingData &responseData, QObject *parent)
: QObject(parent), m_params(params), m_advData(advData), m_responseData(responseData) {}
- virtual ~QLeAdvertiser() { }
+ ~QLeAdvertiser() override;
protected:
const QLowEnergyAdvertisingParameters &parameters() const { return m_params; }