diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2020-05-18 14:43:25 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-19 23:45:54 +0200 |
| commit | 7c070ac95979609e6ba33b829dc4a2a373ef26b5 (patch) | |
| tree | 9edc4cc4876a28ac45aeb0a3f036242b075c1092 /src/network | |
| parent | 857722ed8f16bb5b9e64154690f6b0bf3f880dd7 (diff) | |
Sweep Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6 -> Q_DECLARE_SHARED
This is Qt 6, so Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6 is the same as
Q_DECLARE_SHARED.
Let's hope we'll collectively get better at detecting missing
Q_DECLARE_SHARED so we won't need a
Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT7 in the future.
Change-Id: I3da9faff4c66b64a3b257309012a2a10a6c6d027
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qhostaddress.h | 2 | ||||
| -rw-r--r-- | src/network/kernel/qhostinfo.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h index ffa08aca30..6f83bdef05 100644 --- a/src/network/kernel/qhostaddress.h +++ b/src/network/kernel/qhostaddress.h @@ -160,7 +160,7 @@ protected: QExplicitlySharedDataPointer<QHostAddressPrivate> d; }; Q_DECLARE_OPERATORS_FOR_FLAGS(QHostAddress::ConversionMode) -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QHostAddress) +Q_DECLARE_SHARED(QHostAddress) inline bool operator ==(QHostAddress::SpecialAddress address1, const QHostAddress &address2) { return address2 == address1; } diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h index cda286b423..047ab3bbd9 100644 --- a/src/network/kernel/qhostinfo.h +++ b/src/network/kernel/qhostinfo.h @@ -156,7 +156,7 @@ private: QtPrivate::QSlotObjectBase *slotObj); }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QHostInfo) +Q_DECLARE_SHARED(QHostInfo) QT_END_NAMESPACE |