summaryrefslogtreecommitdiffstats
path: root/src/xml
diff options
context:
space:
mode:
authorSinan Tanilkan <sinan.tanilkan@nokia.com>2011-09-21 11:45:02 (GMT)
committerSinan Tanilkan <sinan.tanilkan@nokia.com>2011-09-21 11:45:02 (GMT)
commit160b82950ec53d3a0392df0fd18ac6856bfecbcf (patch)
tree1bdae6efe3fbcb7f25e0ce91884f83e1cdf68189 /src/xml
parent8ba781b01e900148fec2e9d26485369b3295487f (diff)
parent085bd7cf2d76f9acd548120f859201b014970a72 (diff)
downloadQt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.zip
Qt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.tar.gz
Qt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.tar.bz2
Merge branch '4.8' into earth-staging-master
Conflicts: dist/changes-4.8.0
Diffstat (limited to 'src/xml')
-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));