purge CODECFORTR & -codecfortr support

qt-based code is expected to be utf8-encoded nowadays. the respective
c++ interfaces have been purged in 5.0 already.

Change-Id: I592b49f198aae05212afbf8d3aa2b01b1e9369dd
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

36 files changed, 8 insertions, 540 deletions

diff --git a/tests/auto/linguist/lconvert/data/codec-cp1252.ts b/tests/auto/linguist/lconvert/data/codec-cp1252.ts
deleted file mode 100644
index 5ffa2f3d6..000000000
--- a/tests/auto/linguist/lconvert/data/codec-cp1252.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
-<defaultcodec>windows-1252</defaultcodec>
-<context>
-    <name>FooBar</name>
-    <message>
-        <location filename="main.cpp" line="10"/>
-        <source>random ascii only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="main.cpp" line="11"/>
-        <source>this contains an umlaut ü &amp;uuml;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="main.cpp" line="12"/>
-        <source>random ascii only in utf8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <location filename="main.cpp" line="13"/>
-        <source>umlaut ü &amp;uuml; in utf8</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/tests/auto/linguist/lconvert/data/codec-utf8.ts b/tests/auto/linguist/lconvert/data/codec-utf8.ts
index 0ebdbfdd6..1a2b626fb 100644
--- a/tests/auto/linguist/lconvert/data/codec-utf8.ts
+++ b/tests/auto/linguist/lconvert/data/codec-utf8.ts
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0">
-<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>FooBar</name>
     <message>
diff --git a/tests/auto/linguist/lconvert/data/dual-encoding.ts b/tests/auto/linguist/lconvert/data/dual-encoding.ts
deleted file mode 100644
index 5023a04d9..000000000
--- a/tests/auto/linguist/lconvert/data/dual-encoding.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
-<context>
-    <name></name>
-    <message utf8="both">
-        <source>Mühsam</source>
-        <translation>tedious</translation>
-    </message>
-</context>
-</TS>
diff --git a/tests/auto/linguist/lconvert/tst_lconvert.cpp b/tests/auto/linguist/lconvert/tst_lconvert.cpp
index 0f4dfcdad..b6608a8cf 100644
--- a/tests/auto/linguist/lconvert/tst_lconvert.cpp
+++ b/tests/auto/linguist/lconvert/tst_lconvert.cpp
@@ -316,7 +316,6 @@ void tst_lconvert::roundtrips_data()
 
     QTest::newRow("po-ts-po (references)") << "test-refs.po" << poTsPo << 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;
     QTest::newRow("ts-qm-ts (variants)") << "variants.ts" << tsQmTs << outDeArgs;
diff --git a/tests/auto/linguist/lrelease/testdata/dupes.ts b/tests/auto/linguist/lrelease/testdata/dupes.ts
index ec368c327..79bc4506b 100644
--- a/tests/auto/linguist/lrelease/testdata/dupes.ts
+++ b/tests/auto/linguist/lrelease/testdata/dupes.ts
@@ -3,10 +3,6 @@
 <TS version="1.1">
 <context>
     <name>FindDialog</name>
-    <message utf8="true">
-        <source>Search reached start of the document</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="finddialog.cpp" line="109"/>
         <source>Search reached start of the document</source>
diff --git a/tests/auto/linguist/lrelease/testdata/mixedcodecs-ts20.ts b/tests/auto/linguist/lrelease/testdata/mixedcodecs-ts20.ts
deleted file mode 100644
index 8bb56d43f..000000000
--- a/tests/auto/linguist/lrelease/testdata/mixedcodecs-ts20.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
-<defaultcodec>windows-1252</defaultcodec>
-<context>
-    <name>FooBar</name>
-    <message>
-        <location filename="main.cpp" line="11"/>
-        <source>this contains an umlaut ü &amp;uuml;</source>
-        <translation>random stuff with umlaut</translation>
-    </message>
-    <message utf8="true">
-        <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 c3593da68..f53eca36d 100644
--- a/tests/auto/linguist/lrelease/tst_lrelease.cpp
+++ b/tests/auto/linguist/lrelease/tst_lrelease.cpp
@@ -60,7 +60,6 @@ private:
 
 private slots:
     void translate();
-    void mixedcodecs();
     void compressed();
     void idbased();
     void markuntranslated();
@@ -156,9 +155,9 @@ void tst_lrelease::translate()
     QCOMPARE(tr("There are %n cars", "More Plurals", 3) , QString("There are 3 cars"));
 
 
-    QCOMPARE(QCoreApplication::translate("no_en", "Kj\370r K\345re, kj\346re"), QString::fromLatin1("Drive K\345re, dear"));
-    QCOMPARE(QCoreApplication::translate("en_no", "Drive K\345re, dear"), QString::fromLatin1("Kj\370r K\345re, kj\346re"));
-    QCOMPARE(QCoreApplication::translate("en_ch", "Chinese symbol:"), QString::fromLatin1("Chinese symbol:%1").arg(QChar(0x7c1f)));
+    QCOMPARE(QCoreApplication::translate("no_en", "Kj\xc3\xb8r K\xc3\xa5re, kj\xc3\xa6re"), QString::fromUtf8("Drive K\xc3\xa5re, dear"));
+    QCOMPARE(QCoreApplication::translate("en_no", "Drive K\xc3\xa5re, dear"), QString::fromUtf8("Kj\xc3\xb8r K\xc3\xa5re, kj\xc3\xa6re"));
+    QCOMPARE(QCoreApplication::translate("en_ch", "Chinese symbol:"), QString::fromUtf8("Chinese symbol:\xe7\xb0\x9f"));
 
 //    printf("halo\r\nhallo");
   //  QCOMPARE(tr("This\r\nwill fail"), QString("THIS\nWILL FAIL"));    // \r\n =  0d 0a
@@ -171,20 +170,6 @@ void tst_lrelease::translate()
     qApp->removeTranslator(&translator);
 }
 
-void tst_lrelease::mixedcodecs()
-{
-    QVERIFY(!QProcess::execute(binDir + "/lrelease " + dataDir + "mixedcodecs-ts20.ts"));
-
-    QTranslator translator;
-    QVERIFY(translator.load(dataDir + "mixedcodecs-ts20.qm"));
-    qApp->installTranslator(&translator);
-
-    QCOMPARE(QCoreApplication::translate("FooBar", "this contains an umlaut \xfc &uuml;"),
-             QString::fromLatin1("random stuff with umlaut"));
-    QCOMPARE(QCoreApplication::translate("FooBar", "umlaut \xc3\xbc &uuml; in utf8"),
-             QString::fromLatin1("more random stuff with umlaut"));
-}
-
 void tst_lrelease::compressed()
 {
     QVERIFY(!QProcess::execute(binDir + "/lrelease -compress " + dataDir + "compressed.ts"));
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp
index 16594c15e..91e3c5e71 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp
@@ -47,7 +47,7 @@
 int main(int argc, char **argv)
 {
         QApplication a(argc, argv);
-        QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
+
 
         QWidget w;
         QLabel label1(QObject::tr("abc", "ascii"), &w);
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
index f133c60d2..3779ef0e7 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
@@ -3,6 +3,5 @@ CONFIG+= console
 
 TRANSLATIONS = project.ts
 
-CODECFORTR = utf-8
 CODECFORSRC = utf-8
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.ts.result
index 711bf025a..b1a40ade8 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.ts.result
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0">
-<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecfortr/main.cpp
deleted file mode 100644
index 436039fa2..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr/main.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QtGui>
-#include <QtCore>
-#include <QTextCodec>
-
-int main(int argc, char **argv)
-{
-        QApplication a(argc, argv);
-        QTranslator trans(0);
-
-        trans.load("t1_en", ".");
-
-        a.installTranslator(&trans);
-        QWidget w;
-/*
-        QLabel label1(QObject::tr("\33"), &w);
-        QLabel label2(QObject::tr("\32"), &w);
-        QLabel label3(QObject::tr("\176"), &w);
-*/
-        QLabel label4(QObject::tr("\301"), &w);
-
-        w.show();
-        return a.exec();
-}
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro
deleted file mode 100644
index 884fc5273..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCES += main.cpp
-CONFIG+= console
-
-TRANSLATIONS = project.ts
-
-CODECFORTR = CP1251
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.ts.result
deleted file mode 100644
index 6ee369a78..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.ts.result
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
-<defaultcodec>windows-1251</defaultcodec>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="main.cpp" line="61"/>
-        <source>Б</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/main.cpp
deleted file mode 100644
index deea8031f..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/main.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore>
-
-class FooBar : QObject
-{
-    Q_OBJECT
-
-public:
-    void doFoo()
-    {
-        tr("random ascii only");
-        tr("this contains an umlaut ü &uuml; literally");
-        tr("this contains an umlaut \xfc &uuml; escaped");
-        trUtf8("random ascii only in utf8");
-        trUtf8("umlaut ü &uuml; in literal utf8");
-        trUtf8("umlaut \303\274 &uuml; in escaped utf8");
-    }
-};
-
-int main(int argc, char **argv)
-{
-    return 0;
-}
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro
deleted file mode 100644
index 6d21e0d2f..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCES += main.cpp
-CONFIG += console
-
-TRANSLATIONS = project.ts
-
-CODECFORTR = CP1252
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result
deleted file mode 100644
index d548e2465..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
-<defaultcodec>windows-1252</defaultcodec>
-<context>
-    <name>FooBar</name>
-    <message>
-        <location filename="main.cpp" line="51"/>
-        <source>random ascii only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="main.cpp" line="52"/>
-        <source>this contains an umlaut ü &amp;uuml; literally</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="main.cpp" line="53"/>
-        <source>this contains an umlaut ü &amp;uuml; escaped</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="main.cpp" line="54"/>
-        <source>random ascii only in utf8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <location filename="main.cpp" line="55"/>
-        <source>umlaut ü &amp;uuml; in literal utf8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <location filename="main.cpp" line="56"/>
-        <source>umlaut ü &amp;uuml; in escaped utf8</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/main.cpp
deleted file mode 100644
index a5fb61fee..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/main.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore>
-
-class FooBar : QObject
-{
-    Q_OBJECT
-
-public:
-    void doFoo()
-    {
-        tr("random ascii only");
-        tr("this contains an umlaut ü &uuml; literally");
-        tr("this contains an umlaut \303\274 &uuml; escaped, really in utf-8");
-        trUtf8("random ascii only in utf8");
-        trUtf8("umlaut \303\274 &uuml; in escaped utf8");
-    }
-};
-
-int main(int argc, char **argv)
-{
-    return 0;
-}
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro
deleted file mode 100644
index 8918087e8..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-SOURCES += main.cpp
-CONFIG += console
-
-TRANSLATIONS = project.ts
-
-CODECFORSRC = CP1252
-CODECFORTR = UTF-8
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.ts.result
deleted file mode 100644
index 6728a256b..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.ts.result
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
-<defaultcodec>UTF-8</defaultcodec>
-<context>
-    <name>FooBar</name>
-    <message>
-        <location filename="main.cpp" line="51"/>
-        <source>random ascii only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="main.cpp" line="52"/>
-        <source>this contains an umlaut ü &amp;uuml; literally</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="main.cpp" line="53"/>
-        <source>this contains an umlaut ü &amp;uuml; escaped, really in utf-8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="main.cpp" line="54"/>
-        <source>random ascii only in utf8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="main.cpp" line="55"/>
-        <source>umlaut ü &amp;uuml; in escaped utf8</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr3/expectedoutput.txt b/tests/auto/linguist/lupdate/testdata/good/codecfortr3/expectedoutput.txt
deleted file mode 100644
index feecddace..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr3/expectedoutput.txt
+++ /dev/null
@@ -1 +0,0 @@
-lupdate warning: Codec for tr\(\) 'ISO-8859-1' disagrees with existing file's codec 'UTF-8'\. Expect trouble\.
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr3/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecfortr3/main.cpp
deleted file mode 100644
index 757ccc95b..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr3/main.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-int main(int argc, char **argv)
-{
-    QObject::tr("hi");
-}
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr3/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr3/project.pro
deleted file mode 100644
index 1a2f50e41..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr3/project.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES += main.cpp
-
-TRANSLATIONS = project.ts
-CODECFORTR = latin1
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr3/project.ts.before b/tests/auto/linguist/lupdate/testdata/good/codecfortr3/project.ts.before
deleted file mode 100644
index 07ad79b82..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr3/project.ts.before
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
-<defaultcodec>UTF-8</defaultcodec>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="main.cpp" line="44"/>
-        <source>hi</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr3/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/codecfortr3/project.ts.result
deleted file mode 100644
index b6899c162..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr3/project.ts.result
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="main.cpp" line="44"/>
-        <source>hi</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr4/expectedoutput.txt b/tests/auto/linguist/lupdate/testdata/good/codecfortr4/expectedoutput.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr4/expectedoutput.txt
+++ /dev/null
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr4/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecfortr4/main.cpp
deleted file mode 100644
index 757ccc95b..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr4/main.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-int main(int argc, char **argv)
-{
-    QObject::tr("hi");
-}
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr4/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr4/project.pro
deleted file mode 100644
index 2d08a07de..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr4/project.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES += main.cpp
-
-TRANSLATIONS = project.ts
-CODECFORTR = latin2
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr4/project.ts.before b/tests/auto/linguist/lupdate/testdata/good/codecfortr4/project.ts.before
deleted file mode 100644
index e18e34e0e..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr4/project.ts.before
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
-<defaultcodec>ISO-8859-2</defaultcodec>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="main.cpp" line="44"/>
-        <source>hi</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr4/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/codecfortr4/project.ts.result
deleted file mode 100644
index e18e34e0e..000000000
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr4/project.ts.result
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
-<defaultcodec>ISO-8859-2</defaultcodec>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="main.cpp" line="44"/>
-        <source>hi</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/main.cpp
index 7d3f63839..9f47f3176 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/main.cpp
@@ -51,9 +51,9 @@ class Dialog2 : public QDialog
 
 void Dialog2::func()
 {
-    tr("cat\351gorie");
+    tr("cat\xc3\xa9gorie");
 
-    tr("F\374r \310lise")
+    tr("F\xc3\xbcr \xc3\x88lise")
 }
 
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
index 7d87d17c6..c8cca3f04 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
@@ -134,7 +134,7 @@ backslashed \ stuff.</source>
 </context>
 <context>
     <name>KÃ¥ntekst</name>
-    <message utf8="true">
+    <message>
         <location filename="finddialog.cpp" line="180"/>
         <source>encoding, using QApplication</source>
         <translation type="unfinished"></translation>
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseui/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parseui/project.ts.result
index b27d23991..d53c6d8e4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseui/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/parseui/project.ts.result
@@ -8,7 +8,7 @@
         <source>Qt Assistant - Finn text</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
+    <message>
         <location filename="project.ui" line="58"/>
         <source>Finn tekst - Der Bjørn möchte auch mal.</source>
         <translation type="unfinished"></translation>
diff --git a/tests/auto/linguist/lupdate/testdata/good/recurse_full/project_sub.ts.result b/tests/auto/linguist/lupdate/testdata/good/recurse_full/project_sub.ts.result
index cddb9632f..ca9504eb5 100644
--- a/tests/auto/linguist/lupdate/testdata/good/recurse_full/project_sub.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/recurse_full/project_sub.ts.result
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0">
-<defaultcodec>ISO-8859-2</defaultcodec>
 <context>
     <name>subsub2</name>
     <message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/recurse_part/project_sub.ts.result b/tests/auto/linguist/lupdate/testdata/good/recurse_part/project_sub.ts.result
index cddb9632f..ca9504eb5 100644
--- a/tests/auto/linguist/lupdate/testdata/good/recurse_part/project_sub.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/recurse_part/project_sub.ts.result
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0">
-<defaultcodec>ISO-8859-2</defaultcodec>
 <context>
     <name>subsub2</name>
     <message>
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/subsub2.pro b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/subsub2.pro
index afbcd9cf7..26a954a26 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/subsub2.pro
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/subsub2.pro
@@ -1,5 +1,4 @@
 SOURCES += main.cpp
 
 TRANSLATIONS = ../../project_sub.ts
-CODECFORTR = ISO-8859-2
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/subsub2.pro b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/subsub2.pro
index afbcd9cf7..26a954a26 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/subsub2.pro
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/subsub2.pro
@@ -1,5 +1,4 @@
 SOURCES += main.cpp
 
 TRANSLATIONS = ../../project_sub.ts
-CODECFORTR = ISO-8859-2
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0