diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-07 14:45:09 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-07 14:45:09 (GMT) |
| commit | d7a91cfe8683309883694fbbf508e5fc42d44165 (patch) | |
| tree | 95e248d34d10015778f7a00477c59e265501d443 /tests/auto/linguist/lupdate/testdata/good | |
| parent | b7aa20e56b3ed45cf00d8a57696e6d8ac803f9b4 (diff) | |
| parent | c39b3d42dda26b1f9576906cd001236c9d96e06a (diff) | |
| download | Qt-d7a91cfe8683309883694fbbf508e5fc42d44165.zip Qt-d7a91cfe8683309883694fbbf508e5fc42d44165.tar.gz Qt-d7a91cfe8683309883694fbbf508e5fc42d44165.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Conflicts:
doc/src/declarative/propertybinding.qdoc
src/declarative/util/qdeclarativeview.cpp
Diffstat (limited to 'tests/auto/linguist/lupdate/testdata/good')
| -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> |