purge TS 1.1 support

at the time of release it will be almost five years since we introduced
TS 2.0 and stopped writing 1.1 by default, so there shouldn't be much of
a need to write such files any more - and this commit doesn't even
remove 1.1 reading capability (because it comes for free so far).

Change-Id: Ie54fe31f83733ef944306c01301c0ec0e9bcb8bf
Reviewed-by: hjk <hjk121@nokiamail.com>

4 files changed, 1 insertions, 64 deletions

diff --git a/tests/auto/linguist/lconvert/data/test11.ts b/tests/auto/linguist/lconvert/data/test11.ts
deleted file mode 100644
index aeb46af9..00000000
--- a/tests/auto/linguist/lconvert/data/test11.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="1.1" language="de_DE">
-<context>
-    <name>FindDialog</name>
-    <message>
-        <location filename="finddialog.cpp" line="57"/>
-        <source>Enter the text you want to find.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="finddialog.cpp" line="107"/>
-        <source>Search reached end of the document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="finddialog.cpp" line="109"/>
-        <source>Search reached start of the document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="finddialog.cpp" line="111"/>
-        <source>Text not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="finddialog.cpp" line="122"/>
-        <source>Should be obsolete</source>
-        <translation type="unfinished">SHOULD BE OBSOLETE</translation>
-    </message>
-</context>
-</TS>
diff --git a/tests/auto/linguist/lconvert/tst_lconvert.cpp b/tests/auto/linguist/lconvert/tst_lconvert.cpp
index 83f58539..0f4dfcda 100644
--- a/tests/auto/linguist/lconvert/tst_lconvert.cpp
+++ b/tests/auto/linguist/lconvert/tst_lconvert.cpp
@@ -285,9 +285,7 @@ void tst_lconvert::roundtrips_data()
 
     QStringList poTsPo; poTsPo << "po" << "ts" << "po";
     QStringList poXlfPo; poXlfPo << "po" << "xlf" << "po";
-    QStringList tsTs11Ts; tsTs11Ts << "ts" << "ts11" << "ts";
     QStringList tsPoTs; tsPoTs << "ts" << "po" << "ts";
-    QStringList ts11PoTs11; ts11PoTs11 << "ts11" << "po" << "ts11";
     QStringList tsXlfTs; tsXlfTs << "ts" << "xlf" << "ts";
     QStringList tsQmTs; tsQmTs << "ts" << "qm" << "ts";
 
@@ -301,7 +299,6 @@ void tst_lconvert::roundtrips_data()
     QTest::newRow("po-ts-po (developer comment)") << "test-developer-comment.po" << poTsPo << noArgs;
     QTest::newRow("po-xliff-po (developer comment)") << "test-developer-comment.po" << poXlfPo << noArgs;
 
-    QTest::newRow("ts11-po-ts11") << "test11.ts" << ts11PoTs11 << filterPoArgs;
     QTest::newRow("ts20-po-ts20") << "test20.ts" << tsPoTs << filterPoArgs;
     QTest::newRow("po-ts-po (de)") << "test1-de.po" << poTsPo << noArgs;
     QTest::newRow("po-ts-po (cn)") << "test1-cn.po" << poTsPo << noArgs;
@@ -319,10 +316,6 @@ void tst_lconvert::roundtrips_data()
 
     QTest::newRow("po-ts-po (references)") << "test-refs.po" << poTsPo << noArgs;
 
-    QTest::newRow("ts20-ts11-ts20 (utf8)") << "codec-utf8.ts" << tsTs11Ts << noArgs;
-    QTest::newRow("ts20-ts11-ts20 (cp1252)") << "codec-cp1252.ts" << tsTs11Ts << noArgs;
-    QTest::newRow("ts20-ts11-ts20 (dual-encoding)") << "dual-encoding.ts" << tsTs11Ts << noArgs;
-
     QTest::newRow("ts-qm-ts (dual-encoding)") << "dual-encoding.ts" << tsQmTs << noArgs;
     QTest::newRow("ts-qm-ts (plurals-de)") << "plurals-de.ts" << tsQmTs << outDeArgs;
     QTest::newRow("ts-qm-ts (plurals-cn)") << "plurals-cn.ts" << tsQmTs << outCnArgs;
diff --git a/tests/auto/linguist/lrelease/testdata/mixedcodecs-ts11.ts b/tests/auto/linguist/lrelease/testdata/mixedcodecs-ts11.ts
deleted file mode 100644
index 991f3543..00000000
--- a/tests/auto/linguist/lrelease/testdata/mixedcodecs-ts11.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="1.1">
-<defaultcodec>windows-1252</defaultcodec>
-<context>
-    <name>FooBar</name>
-    <message>
-        <location filename="main.cpp" line="11"/>
-        <source>this contains an umlaut &#xfc; &amp;uuml;</source>
-        <translation>random stuff with umlaut</translation>
-    </message>
-    <message encoding="UTF-8">
-        <location filename="main.cpp" line="13"/>
-        <source>umlaut ü &amp;uuml; in utf8</source>
-        <translation>more random stuff with umlaut</translation>
-    </message>
-</context>
-</TS>
diff --git a/tests/auto/linguist/lrelease/tst_lrelease.cpp b/tests/auto/linguist/lrelease/tst_lrelease.cpp
index fc9f96d5..c3593da6 100644
--- a/tests/auto/linguist/lrelease/tst_lrelease.cpp
+++ b/tests/auto/linguist/lrelease/tst_lrelease.cpp
@@ -173,16 +173,10 @@ void tst_lrelease::translate()
 
 void tst_lrelease::mixedcodecs()
 {
-    QVERIFY(!QProcess::execute(binDir + "/lrelease " + dataDir + "mixedcodecs-ts11.ts"));
     QVERIFY(!QProcess::execute(binDir + "/lrelease " + dataDir + "mixedcodecs-ts20.ts"));
-#ifdef Q_OS_WIN
-    QVERIFY(!QProcess::execute("fc /b testdata\\mixedcodecs-ts11.qm testdata\\mixedcodecs-ts20.qm"));
-#else
-    QVERIFY(!QProcess::execute("cmp " + dataDir + "mixedcodecs-ts11.qm " + dataDir + "mixedcodecs-ts20.qm"));
-#endif
 
     QTranslator translator;
-    QVERIFY(translator.load(dataDir + "mixedcodecs-ts11.qm"));
+    QVERIFY(translator.load(dataDir + "mixedcodecs-ts20.qm"));
     qApp->installTranslator(&translator);
 
     QCOMPARE(QCoreApplication::translate("FooBar", "this contains an umlaut \xfc &uuml;"),