diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-27 22:46:13 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-27 22:46:13 +0200 |
| commit | 3e7f3a198c26fce9d19fab38d33444d05ea29c74 (patch) | |
| tree | d16d5de3df640ca794e383ca332ee8a211111fcf /tests/auto/linguist/lupdate/testdata | |
| parent | 140fa19ad926f15246c8a501f8a3ccdeda4c5420 (diff) | |
| parent | 262744ac1b6ba95d72bedc7679e2b49c11c74803 (diff) | |
| download | qttools-3e7f3a198c26fce9d19fab38d33444d05ea29c74.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I5db3f62185e7e99ce2c701debd00a44f40a9f5e5
Diffstat (limited to 'tests/auto/linguist/lupdate/testdata')
3 files changed, 7 insertions, 3 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp index f07b85596..62ececc58 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp @@ -399,3 +399,6 @@ Class42::hello(int something /*= 17 */, QString str = Class42::tr("eyo")) // QTBUG-27974: strings from included sources are not collected #include "included.cpp" + +// test TR_EXCLUDE +#include "notincluded.cpp" diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro index ac5c2846e..0fd8a9627 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro @@ -2,6 +2,6 @@ SOURCES += main.cpp SOURCES += finddialog.cpp SOURCES += excluded.cpp -TR_EXCLUDE = $$PWD/excluded.* +TR_EXCLUDE = $$PWD/excluded.* $$PWD/notincluded.cpp TRANSLATIONS = project.ts diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro index 5e23538b9..73c6d19a7 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro @@ -1,6 +1,7 @@ include(win/win.pri) -include(mac/mac.pri) -include(unix/unix.pri) +more = mac unix +for(dir, more): \ + include($$dir/$${dir}.pri) include (common/common.pri) # Important: keep the space before the '(' include(relativity/relativity.pri) |