1 files changed, 14 insertions, 16 deletions

diff --git a/src/corelib/xml/qxmlstream_p.h b/src/corelib/xml/qxmlstream_p.h
index 9ef95c1fbe..8ef6e4b8fe 100644
--- a/src/corelib/xml/qxmlstream_p.h
+++ b/src/corelib/xml/qxmlstream_p.h
@@ -701,20 +701,18 @@ public:
     bool tagsDone;
 
     inline QStringRef addToStringStorage(const QStringRef &s) {
-        int pos = tagStackStringStorageSize;
-        int sz = s.size();
-        if (pos != tagStackStringStorage.size())
-            tagStackStringStorage.resize(pos);
-        tagStackStringStorage.insert(pos, s.unicode(), sz);
-        tagStackStringStorageSize += sz;
-        return QStringRef(&tagStackStringStorage, pos, sz);
+        return addToStringStorage(qToStringViewIgnoringNull(s));
     }
     inline QStringRef addToStringStorage(const QString &s) {
+        return addToStringStorage(qToStringViewIgnoringNull(s));
+    }
+    QStringRef addToStringStorage(QStringView s)
+    {
         int pos = tagStackStringStorageSize;
         int sz = s.size();
         if (pos != tagStackStringStorage.size())
             tagStackStringStorage.resize(pos);
-        tagStackStringStorage.insert(pos, s.unicode(), sz);
+        tagStackStringStorage.append(s.data(), sz);
         tagStackStringStorageSize += sz;
         return QStringRef(&tagStackStringStorage, pos, sz);
     }
@@ -1508,12 +1506,12 @@ bool QXmlStreamReaderPrivate::parse()
             processingInstructionTarget = symString(3);
             if (scanUntil("?>")) {
                 processingInstructionData = QStringRef(&textBuffer, pos, textBuffer.size() - pos - 2);
-                const QString piTarget(processingInstructionTarget.toString());
-                if (!piTarget.compare(QLatin1String("xml"), Qt::CaseInsensitive)) {
+                if (!processingInstructionTarget.compare(QLatin1String("xml"), Qt::CaseInsensitive)) {
                     raiseWellFormedError(QXmlStream::tr("XML declaration not at start of document."));
                 }
-                else if(!QXmlUtils::isNCName(piTarget))
-                    raiseWellFormedError(QXmlStream::tr("%1 is an invalid processing instruction name.").arg(piTarget));
+                else if (!QXmlUtils::isNCName(processingInstructionTarget))
+                    raiseWellFormedError(QXmlStream::tr("%1 is an invalid processing instruction name.")
+                                         .arg(processingInstructionTarget));
             } else if (type != QXmlStreamReader::Invalid){
                 resume(96);
                 return false;
@@ -1523,7 +1521,7 @@ bool QXmlStreamReaderPrivate::parse()
         case 97:
             setType(QXmlStreamReader::ProcessingInstruction);
             processingInstructionTarget = symString(3);
-            if (!processingInstructionTarget.toString().compare(QLatin1String("xml"), Qt::CaseInsensitive))
+            if (!processingInstructionTarget.compare(QLatin1String("xml"), Qt::CaseInsensitive))
                 raiseWellFormedError(QXmlStream::tr("Invalid processing instruction name."));
         break;
 
@@ -1637,8 +1635,8 @@ bool QXmlStreamReaderPrivate::parse()
         break;
 
         case 175: {
-            if (!QXmlUtils::isPublicID(symString(1).toString())) {
-                raiseWellFormedError(QXmlStream::tr("%1 is an invalid PUBLIC identifier.").arg(symString(1).toString()));
+            if (!QXmlUtils::isPublicID(symString(1))) {
+                raiseWellFormedError(QXmlStream::tr("%1 is an invalid PUBLIC identifier.").arg(symString(1)));
                 resume(175);
                 return false;
             }
@@ -1845,7 +1843,7 @@ bool QXmlStreamReaderPrivate::parse()
                     clearSym();
                 }
             } else if (entitiesMustBeDeclared()) {
-                raiseWellFormedError(QXmlStream::tr("Entity '%1' not declared.").arg(symString(2).toString()));
+                raiseWellFormedError(QXmlStream::tr("Entity '%1' not declared.").arg(symString(2)));
             }
         } break;