diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-05-14 14:04:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-05-16 23:50:40 +0200 |
| commit | 24abd0d14ebd420c275fa4e49ddb1a43b441c74f (patch) | |
| tree | caa07379ab70b27f9074155fb8420c84b10c48ae | |
| parent | c7d3ab0d058ce71079c2f49ab20fcbe8ddcde072 (diff) | |
Compile with latest qtbase dev
Get rid of QTextCodec in QQmlError and qcoloroutput.cpp and etc.
Change-Id: I26ab81536d12eb0587d5d9ae747f6a379a4d0b12
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/qml/qml/qqmlerror.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp | 4 | ||||
| -rw-r--r-- | tools/qmllint/qcoloroutput.cpp | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlerror.cpp b/src/qml/qml/qqmlerror.cpp index da585d2126..c71c33a059 100644 --- a/src/qml/qml/qqmlerror.cpp +++ b/src/qml/qml/qqmlerror.cpp @@ -317,9 +317,6 @@ QDebug operator<<(QDebug debug, const QQmlError &error) if (f.open(QIODevice::ReadOnly)) { QByteArray data = f.readAll(); QTextStream stream(data, QIODevice::ReadOnly); -#if QT_CONFIG(textcodec) - stream.setCodec("UTF-8"); -#endif const QString code = stream.readAll(); const auto lines = code.splitRef(QLatin1Char('\n')); diff --git a/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp b/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp index b69b466947..6f59cca1b1 100644 --- a/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp +++ b/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp @@ -220,13 +220,13 @@ void tst_qqmlmetatype::qmlType() QQmlType type = QQmlMetaType::qmlType(QString("ParserStatusTestType"), QString("Test"), QTypeRevision::fromVersion(1, 0)); QVERIFY(type.isValid()); - QVERIFY(type.module() == QLatin1String("Test")); + QVERIFY(type.module() == QHashedString("Test")); QVERIFY(type.elementName() == QLatin1String("ParserStatusTestType")); QCOMPARE(type.qmlTypeName(), QLatin1String("Test/ParserStatusTestType")); type = QQmlMetaType::qmlType("Test/ParserStatusTestType", QTypeRevision::fromVersion(1, 0)); QVERIFY(type.isValid()); - QVERIFY(type.module() == QLatin1String("Test")); + QVERIFY(type.module() == QHashedString("Test")); QVERIFY(type.elementName() == QLatin1String("ParserStatusTestType")); QCOMPARE(type.qmlTypeName(), QLatin1String("Test/ParserStatusTestType")); } diff --git a/tools/qmllint/qcoloroutput.cpp b/tools/qmllint/qcoloroutput.cpp index 84bd22c428..ce0545b1a9 100644 --- a/tools/qmllint/qcoloroutput.cpp +++ b/tools/qmllint/qcoloroutput.cpp @@ -30,7 +30,6 @@ #include <QtCore/qfile.h> #include <QtCore/qhash.h> -#include <QtCore/qtextcodec.h> #ifndef Q_OS_WIN #include <unistd.h> |