summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-01-06 13:11:42 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-01-06 18:16:21 (GMT)
commit79f1414fabe097d1fb87b2f3153dcde910e0b2cb (patch)
tree83dea0ee6e3233a02ad41378c60759d3a8846197 /tests
parent9e6104565cbe2ae7559791fa6e4787d890477588 (diff)
downloadQt-79f1414fabe097d1fb87b2f3153dcde910e0b2cb.zip
Qt-79f1414fabe097d1fb87b2f3153dcde910e0b2cb.tar.gz
Qt-79f1414fabe097d1fb87b2f3153dcde910e0b2cb.tar.bz2
no point in specifying -ts when a .pro file is specified
... unless of course one hits this weird lupdate behavior regarding SUBDIRS in conjunction with -ts. just use the flag for this one test for now.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/backslashes/lupdatecmd1
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/proparsingsubs/lupdatecmd1
-rw-r--r--tests/auto/linguist/lupdate/tst_lupdate.cpp5
3 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/backslashes/lupdatecmd b/tests/auto/linguist/lupdate/testdata/good/backslashes/lupdatecmd
index 13b2927..f0e1ab2 100644
--- a/tests/auto/linguist/lupdate/testdata/good/backslashes/lupdatecmd
+++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/lupdatecmd
@@ -1,2 +1 @@
TRANSLATION: ts\project.ts
-lupdate project.pro
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/lupdatecmd b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/lupdatecmd
new file mode 100644
index 0000000..b7e12cc
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/lupdatecmd
@@ -0,0 +1 @@
+lupdate project.pro -ts project.ts
diff --git a/tests/auto/linguist/lupdate/tst_lupdate.cpp b/tests/auto/linguist/lupdate/tst_lupdate.cpp
index 7140ede..e880eed 100644
--- a/tests/auto/linguist/lupdate/tst_lupdate.cpp
+++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp
@@ -197,9 +197,8 @@ void tst_lupdate::good()
file.close();
}
- if (lupdatecmd.isEmpty()) {
- lupdatecmd = QLatin1String("project.pro -ts project.ts");
- }
+ if (lupdatecmd.isEmpty())
+ lupdatecmd = QLatin1String("project.pro");
lupdatecmd.prepend("-silent ");
m_lupdate.updateProFile(lupdatecmd);