From 9390c44338b74373c6c076ac2df836ba471c43b0 Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Thu, 23 Feb 2017 15:40:15 +0000
Subject: QtXml: add some missing Q_DECLARE_TYPEINFO

Change-Id: I4b58aad1c337fe5fdfb70eb517a66b15a34dffc4
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/xml/sax/qxml.h   | 2 ++
 src/xml/sax/qxml_p.h | 6 ++++++
 2 files changed, 8 insertions(+)

(limited to 'src/xml/sax')

diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h
index 49c8184d4b..77a5a78650 100644
--- a/src/xml/sax/qxml.h
+++ b/src/xml/sax/qxml.h
@@ -156,11 +156,13 @@ private:
     struct Attribute {
         QString qname, uri, localname, value;
     };
+    friend class QTypeInfo<Attribute>;
     typedef QList<Attribute> AttributeList;
     AttributeList attList;
 
     QXmlAttributesPrivate *d;
 };
+Q_DECLARE_TYPEINFO(QXmlAttributes::Attribute, Q_MOVABLE_TYPE);
 Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QXmlAttributes)
 
 //
diff --git a/src/xml/sax/qxml_p.h b/src/xml/sax/qxml_p.h
index 5f3785a289..98dc2aea0c 100644
--- a/src/xml/sax/qxml_p.h
+++ b/src/xml/sax/qxml_p.h
@@ -85,6 +85,8 @@ private:
 
         Q_DUMMY_COMPARISON_OPERATOR(ExternParameterEntity)
     };
+    friend class QTypeInfo<ExternParameterEntity>;
+
     struct ExternEntity
     {
         ExternEntity() {}
@@ -95,6 +97,8 @@ private:
         QString notation;
         Q_DUMMY_COMPARISON_OPERATOR(ExternEntity)
     };
+    friend class QTypeInfo<ExternEntity>;
+
     QMap<QString,ExternParameterEntity> externParameterEntities;
     QMap<QString,QString> parameterEntities;
     QMap<QString,ExternEntity> externEntities;
@@ -306,6 +310,8 @@ private:
 };
 Q_DECLARE_TYPEINFO(QXmlSimpleReaderPrivate::ParseState, Q_PRIMITIVE_TYPE);
 Q_DECLARE_TYPEINFO(QXmlSimpleReaderPrivate::XmlRef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QXmlSimpleReaderPrivate::ExternParameterEntity, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QXmlSimpleReaderPrivate::ExternEntity, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-- 
cgit v1.2.3