From 7c070ac95979609e6ba33b829dc4a2a373ef26b5 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 18 May 2020 14:43:25 +0200 Subject: 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 --- src/dbus/qdbusconnection.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dbus/qdbusconnection.h') diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index 368f811602..1361fc5035 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -212,7 +212,7 @@ private: friend class QDBusConnectionPrivate; QDBusConnectionPrivate *d; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusConnection) +Q_DECLARE_SHARED(QDBusConnection) Q_DECLARE_OPERATORS_FOR_FLAGS(QDBusConnection::RegisterOptions) Q_DECLARE_OPERATORS_FOR_FLAGS(QDBusConnection::VirtualObjectRegisterOptions) -- cgit v1.2.3