From a2c8524ad7dd59f31b400b5da8979138dc835fcc Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 2 Aug 2023 19:30:14 +0200 Subject: [PATCH] QHostInfo: de-inline -Result and -Runnable dtors These classes are not exported, so we don't run into duplicate vtables here, but the header is included in a few TUs other than qhostinfo.cpp (all, when building with PCH), so make sure we compile dtors only once. Pick-to: 6.6 6.5 Change-Id: I51f6a6d27fc084ad469f82dc7aef3327bdd9a906 Reviewed-by: Ivan Solovev Reviewed-by: Thiago Macieira Reviewed-by: Qt CI Bot --- src/network/kernel/qhostinfo.cpp | 6 ++++++ src/network/kernel/qhostinfo_p.h | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index d15c4f27ca..3e1b019a93 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -72,6 +72,9 @@ Q_APPLICATION_STATIC(QHostInfoLookupManager, theHostInfoLookupManager) } +QHostInfoResult::~QHostInfoResult() + = default; + /* The calling thread is likely the one that executes the lookup via QHostInfoRunnable. Unless we operate with a queued connection already, @@ -818,6 +821,9 @@ QHostInfoRunnable::QHostInfoRunnable(const QString &hn, int i, const QObject *re setAutoDelete(true); } +QHostInfoRunnable::~QHostInfoRunnable() + = default; + // the QHostInfoLookupManager will at some point call this via a QThreadPool void QHostInfoRunnable::run() { diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index 6b755ab0c2..88e8c77429 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/src/network/kernel/qhostinfo_p.h @@ -51,6 +51,8 @@ public: moveToThread(receiver->thread()); } + ~QHostInfoResult() override; + void postResultsReady(const QHostInfo &info); Q_SIGNALS: @@ -143,6 +145,8 @@ class QHostInfoRunnable : public QRunnable public: QHostInfoRunnable(const QString &hn, int i, const QObject *receiver, QtPrivate::QSlotObjectBase *slotObj); + ~QHostInfoRunnable() override; + void run() override; QString toBeLookedUp;