diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-22 16:11:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-22 16:11:37 (GMT) |
| commit | be8ad40ff0594118a5f5a883fcfff35e28c21a30 (patch) | |
| tree | 19e737407a2912c645168b1ff287225e6f80e5b7 /qmake/generators | |
| parent | 03a6cb097a68f12a4169549cc6b83a09549d267f (diff) | |
| parent | 462f5148a3be5835cc8d5b69685473042789c917 (diff) | |
| download | Qt-be8ad40ff0594118a5f5a883fcfff35e28c21a30.zip Qt-be8ad40ff0594118a5f5a883fcfff35e28c21a30.tar.gz Qt-be8ad40ff0594118a5f5a883fcfff35e28c21a30.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix infinite loop in qmake when reading malformed .ts files.
Fix libinfixed usage in Symbian when def files are used
Diffstat (limited to 'qmake/generators')
| -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()) { |