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:
  Ignore child elements in non-application caption/pkg name translations

1 files changed, 6 insertions, 1 deletions

diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index 8f3bf64..8daef4b 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -993,7 +993,12 @@ bool SymbianCommonGenerator::parseTsContent(const QString &tsFilename, SymbianLo
                                     if (xml.name() == sourceElement) {
                                         source = xml.readElementText();
                                     } else if (xml.name() == translationElement) {
-                                        translation = xml.readElementText();
+                                        // Technically translation element can have child elements
+                                        // i.e. numerusform and lengthvariant. We don't support
+                                        // these for actual caption/pkgname translations, but since
+                                        // they may be present on other unrelated message elements,
+                                        // we need to explicitly skip them to avoid parsing errors.
+                                        translation = xml.readElementText(QXmlStreamReader::SkipChildElements);
                                     } else {
                                         xml.skipCurrentElement();
                                     }