diff options
author | Sergio Martins <sergio.martins@kdab.com> | 2018-02-02 11:44:22 +0000 |
---|---|---|
committer | Sérgio Martins <sergio.martins@kdab.com> | 2018-02-05 15:54:34 +0000 |
commit | cf1b732e21b8768c0e423f900a3f11f923863edd (patch) | |
tree | 0e875743d56b140c75cc4b30654c7cc8213b4471 /src/xml | |
parent | 2e0849e79c851318da0f148dd4002b02cea66dbe (diff) |
Introduce QT6_VIRTUAL and QT6_NOT_VIRTUAL macros
To avoid QT_VERSION_CHECK ifdefs
Change-Id: I364903964c72f4df19b8b7c10c19b82d24f63600
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/xml')
-rw-r--r-- | src/xml/sax/qxml.h | 6 |
1 files changed, 2 insertions, 4 deletions
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 { |