diff options
Diffstat (limited to 'src/xml')
| -rw-r--r-- | src/xml/configure.json | 16 | ||||
| -rw-r--r-- | src/xml/qtxmlglobal.h | 3 | ||||
| -rw-r--r-- | src/xml/sax/qxml.h | 11 |
3 files changed, 29 insertions, 1 deletions
diff --git a/src/xml/configure.json b/src/xml/configure.json new file mode 100644 index 0000000000..345eb8544b --- /dev/null +++ b/src/xml/configure.json @@ -0,0 +1,16 @@ +{ + "module": "xml", + "depends": [ + "core" + ], + "testDir": "../../config.tests", + + "features": { + "dom": { + "label": "DOM", + "purpose": "Supports the Document Object Model.", + "section": "File I/O", + "output": [ "publicFeature", "feature" ] + } + } +} diff --git a/src/xml/qtxmlglobal.h b/src/xml/qtxmlglobal.h index de5a8ab39d..ed5de8db87 100644 --- a/src/xml/qtxmlglobal.h +++ b/src/xml/qtxmlglobal.h @@ -41,6 +41,9 @@ #define QTXMLGLOBAL_H #include <QtCore/qglobal.h> +#ifndef QT_BOOTSTRAPPED +# include <QtXml/qtxml-config.h> +#endif QT_BEGIN_NAMESPACE 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; |