diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-22 10:15:48 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-07-22 10:15:48 +0000 |
| commit | 601019e3f42516b5799fe519115f8fbdf44ed18a (patch) | |
| tree | d9c800ede4d8a38a73dcb0f3aea54e5954e64d54 /src/xml/sax/qxml.cpp | |
| parent | b5f18da11fb526a444d2550715d8b867b711e67a (diff) | |
| parent | 782ebeada125e3d8a293c7806e34cc737c30ddda (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/xml/sax/qxml.cpp')
| -rw-r--r-- | src/xml/sax/qxml.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index d4c8519d67..1724076b84 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -1295,7 +1295,7 @@ static QString extractEncodingDecl(const QString &text, bool *needMoreText) *needMoreText = false; int l = text.length(); - QString snip = QString::fromLatin1("<?xml").left(l); + const QLatin1String snip("<?xml", std::min(l, 5)); if (l > 0 && !text.startsWith(snip)) return QString(); |