From cf1b732e21b8768c0e423f900a3f11f923863edd Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Fri, 2 Feb 2018 11:44:22 +0000 Subject: Introduce QT6_VIRTUAL and QT6_NOT_VIRTUAL macros To avoid QT_VERSION_CHECK ifdefs Change-Id: I364903964c72f4df19b8b7c10c19b82d24f63600 Reviewed-by: Lars Knoll --- src/xml/sax/qxml.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/xml/sax/qxml.h') diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index 7c5b5fe204..94dc8dfb8e 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -122,10 +122,8 @@ public: QXmlAttributes &operator=(const QXmlAttributes &) = default; QXmlAttributes &operator=(QXmlAttributes &&) Q_DECL_NOTHROW = default; #endif // default members -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - virtual // ### Qt 6: this value class don't need no virtual dtor -#endif - ~QXmlAttributes(); + + QT6_NOT_VIRTUAL ~QXmlAttributes(); void swap(QXmlAttributes &other) Q_DECL_NOTHROW { -- cgit v1.2.3