diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-14 08:48:16 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-14 08:48:16 (GMT) |
| commit | cf74ef2ca9163ac6e15b6a218ef284f6104cdcab (patch) | |
| tree | 68fc4ba63a8080917550f8c769c8c4e8f64f45a1 /tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro | |
| parent | 3531f4c831407016ef0735d9cdff9b193e4b3f92 (diff) | |
| parent | 862d5433fb694a03715b2327a107b3192b921924 (diff) | |
| download | Qt-cf74ef2ca9163ac6e15b6a218ef284f6104cdcab.zip Qt-cf74ef2ca9163ac6e15b6a218ef284f6104cdcab.tar.gz Qt-cf74ef2ca9163ac6e15b6a218ef284f6104cdcab.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
dist/changes-4.6.1
Diffstat (limited to 'tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro')
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro index f4975f2..c95939c 100644 --- a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro @@ -1,16 +1,7 @@ -TEMPLATE = app - SOURCES += main.cpp +CONFIG += console TRANSLATIONS = project.ts -CONFIG += console CODECFORSRC = CP1252 CODECFORTR = UTF-8 - -exists( $$TRANSLATIONS ) { - win32: system(del $$TRANSLATIONS) - unix: system(rm $$TRANSLATIONS) -} - - |