summaryrefslogtreecommitdiffstats
path: root/src/xml
diff options
context:
space:
mode:
Diffstat (limited to 'src/xml')
-rw-r--r--src/xml/sax/qxml.h2
-rw-r--r--src/xml/sax/qxml_p.h6
2 files changed, 8 insertions, 0 deletions
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