summaryrefslogtreecommitdiffstats
path: root/src/xml/sax/qxml.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-31 07:28:23 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-31 07:28:23 (GMT)
commit4f933036a0ecbc6e6174b312ec2fd6078cea5b70 (patch)
tree2359dbf112a07a005f913aa46765bbf52b8bff95 /src/xml/sax/qxml.cpp
parent1e48d40597bbe12321a5a3e42b3595dc17a7f8e7 (diff)
parentdffa9fdeae46974aab53a502af257a83ec319b1b (diff)
downloadQt-4f933036a0ecbc6e6174b312ec2fd6078cea5b70.zip
Qt-4f933036a0ecbc6e6174b312ec2fd6078cea5b70.tar.gz
Qt-4f933036a0ecbc6e6174b312ec2fd6078cea5b70.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix Symbian system date format parsing. Fix QXmlSimpleReader auto test failer Fix pointer event mapping when windows are fixed to native orientation Fix incorrect Symbian version check. Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds. Improved support for shadow builds in Symbian. Fix def file paths for Symbian shadow builds Giving QUuid::createUuid() more entropy on Symbian Enable running of XQuery test suite QXmlSimpleReader handle external entity reference file over 1k
Diffstat (limited to 'src/xml/sax/qxml.cpp')
-rw-r--r--src/xml/sax/qxml.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index 2f5384b..0c7f2ab 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -7748,7 +7748,13 @@ bool QXmlSimpleReaderPrivate::processReference()
return false;
}
if (ret) {
- QString xmlRefString = ret->data();
+ QString xmlRefString;
+ QString buffer = ret->data();
+ while (buffer.length()>0){
+ xmlRefString += buffer;
+ ret->fetchData();
+ buffer = ret->data();
+ }
delete ret;
if (!stripTextDecl(xmlRefString)) {
reportParseError(QLatin1String(XMLERR_ERRORINTEXTDECL));