diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-10 13:36:53 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-10 13:36:53 (GMT) |
| commit | 7b15c669c336a1d76e3ac001fadde38a294e3e80 (patch) | |
| tree | 2b8e9631019d1bc9af37d9a93bb93ce0eb16381a /tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result | |
| parent | 47bc34f413d9a0c6efac6ca3eead95eed7da2e40 (diff) | |
| parent | 86048e1a09fce11f557d0e8b117229a754ee9098 (diff) | |
| download | Qt-7b15c669c336a1d76e3ac001fadde38a294e3e80.zip Qt-7b15c669c336a1d76e3ac001fadde38a294e3e80.tar.gz Qt-7b15c669c336a1d76e3ac001fadde38a294e3e80.tar.bz2 | |
Merge branch 'tools-team/4.6' (early part) into 4.6
Conflicts:
src/corelib/tools/qscopedpointer.h
Diffstat (limited to 'tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result')
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result index b328e90..ee3d0f6 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result @@ -2,6 +2,14 @@ <!DOCTYPE TS> <TS version="2.0"> <context> + <name></name> + <message id="keep_id"> + <location filename="finddialog.cpp" line="153"/> + <source>This is some random text</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>FindDialog</name> <message> <location filename="finddialog.cpp" line="85"/> |