summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-08-16 15:33:18 +0200
committerMarc Mutz <marc.mutz@kdab.com>2016-09-23 04:37:33 +0000
commitceb3c2ea621a5c5542eb6d127625a934b865e869 (patch)
tree78ed4d0e47d2d5ac5e95596e14b1b7e245b22fc2
parenta41393d0bc05998a7de2dcf872953b6d24b71e96 (diff)
QXmlAttributes: re-enable suppressed move special member functions
... at least for compilers that support defaulting functions. The class is polymorphic, but shouldn't, so add a note to remove the vtable in Qt 6. Change-Id: I93e4402004b7c52ba506946220e214dd6990f1f7 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/xml/sax/qxml.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h
index 4af664d2dd..ee60823003 100644
--- a/src/xml/sax/qxml.h
+++ b/src/xml/sax/qxml.h
@@ -116,7 +116,16 @@ class Q_XML_EXPORT QXmlAttributes
{
public:
QXmlAttributes();
- virtual ~QXmlAttributes();
+#ifdef Q_COMPILER_DEFAULT_MEMBERS
+ QXmlAttributes(const QXmlAttributes &) = default;
+ QXmlAttributes(QXmlAttributes &&) Q_DECL_NOTHROW = default;
+ 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();
int index(const QString& qName) const;
int index(QLatin1String qName) const;