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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml | 3 | ||||
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml b/tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml index 768a4e2..c966fa1 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml +++ b/tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml @@ -93,5 +93,8 @@ QtObject { //: qsTrId() with comment, meta-data and plurals. //~ well-tested True qsTrId("qtn_bar_baz", 10); + + //% "Source text" + qsTrId("qtn_baz_biz"); } } diff --git a/tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result index 7dac8cb..4843902 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result @@ -27,6 +27,11 @@ </translation> <extra-well-tested>True</extra-well-tested> </message> + <message id="qtn_baz_biz"> + <location filename="main.qml" line="98"/> + <source>Source text</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BarContext</name> |