Merge remote-tracking branch 'origin/dev' into wip/cmake

Take 5.

Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3

3 files changed, 2 insertions, 4 deletions

diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index 0e3a87e883..b2fff5b61f 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -2371,7 +2371,7 @@ bool QXmlDefaultHandler::unparsedEntityDecl(const QString&, const QString&,
 /*!
     \reimp
 
-    Sets \a ret to 0, so that the reader uses the system identifier
+    Sets \a ret to \nullptr, so that the reader uses the system identifier
     provided in the XML document.
 */
 bool QXmlDefaultHandler::resolveEntity(const QString&, const QString&,
diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h
index 26b674c894..9be14bd7a9 100644
--- a/src/xml/sax/qxml.h
+++ b/src/xml/sax/qxml.h
@@ -116,12 +116,10 @@ class Q_XML_EXPORT QXmlAttributes
 {
 public:
     QXmlAttributes();
-#ifdef Q_COMPILER_DEFAULT_MEMBERS
     QXmlAttributes(const QXmlAttributes &) = default;
     QXmlAttributes(QXmlAttributes &&) noexcept = default;
     QXmlAttributes &operator=(const QXmlAttributes &) = default;
     QXmlAttributes &operator=(QXmlAttributes &&) noexcept = default;
-#endif // default members
 
     QT6_NOT_VIRTUAL ~QXmlAttributes();
 
diff --git a/src/xml/sax/qxml_p.h b/src/xml/sax/qxml_p.h
index 98dc2aea0c..eb6135db04 100644
--- a/src/xml/sax/qxml_p.h
+++ b/src/xml/sax/qxml_p.h
@@ -229,7 +229,7 @@ private:
     // for the DTD currently being parsed.
     static const int dtdRecursionLimit = 2;
     // The maximum amount of characters an entity value may contain, after expansion.
-    static const int entityCharacterLimit = 1024;
+    static const int entityCharacterLimit = 4096;
 
     const QString &string();
     void stringClear();