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/xml/sax/qxml.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/xml/sax/qxml.h') diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index 5dd9afa672..badc5c778d 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -188,7 +188,7 @@ private: }; Q_DECLARE_TYPEINFO(QXmlAttributes::Attribute, Q_MOVABLE_TYPE); -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QXmlAttributes) +Q_DECLARE_SHARED(QXmlAttributes) // // SAX Input Source -- cgit v1.2.3