diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-22 23:00:15 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-22 23:00:15 (GMT) |
| commit | 8565d6d123227615312a791ae7acc5b252db264a (patch) | |
| tree | b7e26b73dca82687509ba873dbebfd7c205b5646 /qmake/generators/symbian/symbiancommon.cpp | |
| parent | 4c47a46be986681225b67faa73f957276636cc30 (diff) | |
| parent | be8ad40ff0594118a5f5a883fcfff35e28c21a30 (diff) | |
| download | Qt-8565d6d123227615312a791ae7acc5b252db264a.zip Qt-8565d6d123227615312a791ae7acc5b252db264a.tar.gz Qt-8565d6d123227615312a791ae7acc5b252db264a.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'qmake/generators/symbian/symbiancommon.cpp')
| -rw-r--r-- | qmake/generators/symbian/symbiancommon.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp index 602bcc2..d9f12b3 100644 --- a/qmake/generators/symbian/symbiancommon.cpp +++ b/qmake/generators/symbian/symbiancommon.cpp @@ -977,7 +977,7 @@ bool SymbianCommonGenerator::parseTsContent(const QString &tsFilename, SymbianLo QXmlStreamReader xml(&tsFile); - while (xml.name() != tsElement) + while (!xml.atEnd() && xml.name() != tsElement) xml.readNextStartElement(); while (xml.readNextStartElement()) { |