diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-01 17:25:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-01 17:25:38 (GMT) |
| commit | 95b17fbe91eb3b1b0fcac92d8a8934769e4cd847 (patch) | |
| tree | b5a1e5549a118ea5e4da612fc40d814ca2e9c401 /tools/linguist/lupdate | |
| parent | e5974b024828578945bd4c349f5f87f82a635225 (diff) | |
| parent | bb84c5ef4f620af659395b66e6ed792a380b9a1f (diff) | |
| download | Qt-95b17fbe91eb3b1b0fcac92d8a8934769e4cd847.zip Qt-95b17fbe91eb3b1b0fcac92d8a8934769e4cd847.tar.gz Qt-95b17fbe91eb3b1b0fcac92d8a8934769e4cd847.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Don't ignore source-text when generating qsTrId translations for QML
Fix a crash when undoing form layout
Diffstat (limited to 'tools/linguist/lupdate')
| -rw-r--r-- | tools/linguist/lupdate/qdeclarative.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/linguist/lupdate/qdeclarative.cpp b/tools/linguist/lupdate/qdeclarative.cpp index b85b1a7..1c1e9ad 100644 --- a/tools/linguist/lupdate/qdeclarative.cpp +++ b/tools/linguist/lupdate/qdeclarative.cpp @@ -225,7 +225,7 @@ protected: const QString id = literal->value->asString(); bool plural = node->arguments->next; - TranslatorMessage msg(QString(), QString(), + TranslatorMessage msg(QString(), sourcetext, QString(), QString(), m_fileName, node->firstSourceLocation().startLine, QStringList(), TranslatorMessage::Unfinished, plural); |