summaryrefslogtreecommitdiff
path: root/tests/auto/linguist/lupdate/testdata/good
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-03 02:04:01 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-03 02:04:01 +1000
commit5f073cb596b938c1b39621cefd38a3decc6f6fa2 (patch)
tree52db9d364148a9d297213d95238acdb9523dbc57 /tests/auto/linguist/lupdate/testdata/good
parentca618a657879700ca147bf29c8770e0b458f3e19 (diff)
parent95b17fbe91eb3b1b0fcac92d8a8934769e4cd847 (diff)
downloadqt4-tools-5f073cb596b938c1b39621cefd38a3decc6f6fa2.tar.gz
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tests/auto/linguist/lupdate/testdata/good')
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml3
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result5
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 768a4e2293..c966fa112d 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 7dac8cb5f1..4843902987 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>