summaryrefslogtreecommitdiff
path: root/tests/auto/linguist
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-05-18 11:22:02 +0200
committerLars Knoll <lars.knoll@qt.io>2020-05-18 21:05:16 +0200
commit75f2945476a80e33f7ec29d42f04244467b04e1e (patch)
tree50b234fad6122980657f6294420b35326c379258 /tests/auto/linguist
parent74826870c3a1e56884c3b15755de5fda9b73660b (diff)
downloadqttools-75f2945476a80e33f7ec29d42f04244467b04e1e.tar.gz
Get rid of the QTextCodec dependency in linguist
Change-Id: I9f09578b816ff24a23e17b3255ac93c5eb7c321e Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'tests/auto/linguist')
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp2
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/parsecpp/expectedoutput.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp
index 7d9f15565..169c63cd1 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/main.cpp
@@ -29,7 +29,7 @@
#include <QApplication>
#include <QtGui>
#include <QtCore>
-#include <QTextCodec>
+
int main(int argc, char **argv)
{
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/expectedoutput.txt b/tests/auto/linguist/lupdate/testdata/good/parsecpp/expectedoutput.txt
index b67fb4944..c4dbae544 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/expectedoutput.txt
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/expectedoutput.txt
@@ -1,7 +1,7 @@
.*/lupdate/testdata/good/parsecpp/finddialog.cpp:72: Qualifying with unknown namespace/class ::FindDialog
.*/lupdate/testdata/good/parsecpp/finddialog.cpp:122: Qualifying with unknown namespace/class ::FindDialog
.*/lupdate/testdata/good/parsecpp/finddialog.cpp:162: Qualifying with unknown namespace/class ::FindDialog
-.*/lupdate/testdata/good/parsecpp/finddialog.cpp:168: Unsupported encoding Latin1
+.*/lupdate/testdata/good/parsecpp/finddialog.cpp:168: Unsupported encoding Latin1/DefaultCodec/CodecForTr
.*/lupdate/testdata/good/parsecpp/main.cpp:620: tr\(\) cannot be called without context
.*/lupdate/testdata/good/parsecpp/main.cpp:622: tr\(\) cannot be called without context
lupdate warning: Message with id 'yet_another_id' has no source.