diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-23 10:11:11 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-23 10:11:11 (GMT) |
commit | a315c693d0f3dd64711b8459d86b89ddc48e8c1a (patch) | |
tree | 8f966269d797f97d41847c5bb7283297cee20b47 /qmake | |
parent | d37a3529ec883985b2967265f0797d749db74308 (diff) | |
parent | e6694ebe4081b807b1bb0946e17e73840019ec6d (diff) | |
download | Qt-a315c693d0f3dd64711b8459d86b89ddc48e8c1a.zip Qt-a315c693d0f3dd64711b8459d86b89ddc48e8c1a.tar.gz Qt-a315c693d0f3dd64711b8459d86b89ddc48e8c1a.tar.bz2 |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/s60main/newallocator_hook.cpp
tools/runonphone/serenum_unix.cpp
Diffstat (limited to 'qmake')
-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 01a59b0..8747f5a 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()) { |