From bd4ff0b552d5c31eaf35d67208d003b132a4ffba Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 8 Jul 2015 00:42:34 +0200 Subject: [PATCH] QXmlSimpleReader: mark some types as primitive They are held in QStack, thus QVector. Change-Id: I0673b68632b384d6428e881e24ff830d12aecfab Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/xml/sax/qxml_p.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/xml/sax/qxml_p.h b/src/xml/sax/qxml_p.h index 7712b5760c..013c2618a3 100644 --- a/src/xml/sax/qxml_p.h +++ b/src/xml/sax/qxml_p.h @@ -104,6 +104,7 @@ private: QString value; int index; }; + friend class QTypeInfo; QStack xmlRefStack; // used for standalone declaration @@ -166,6 +167,7 @@ private: ParseFunction function; int state; }; + friend class QTypeInfo; QStack *parseStack; // used in parseProlog() @@ -294,6 +296,8 @@ private: friend class QXmlSimpleReaderLocator; friend class QDomHandler; }; +Q_DECLARE_TYPEINFO(QXmlSimpleReaderPrivate::ParseState, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QXmlSimpleReaderPrivate::XmlRef, Q_MOVABLE_TYPE); QT_END_NAMESPACE