From 24ff3a2cbd0c73d1f11c3f0f5a07547446b073a6 Mon Sep 17 00:00:00 2001 From: Marco Benelli Date: Thu, 23 Mar 2017 12:30:06 +0100 Subject: [PATCH] QmlJs: fix compile-time condition The update of the qmljs parser changed the 'ifndef QT_NO_TEXT_CODEC' condition to 'if QT_CONFIG(textcodec)' that causes a compilation failure on some platforms. Since QtCreator does not support development against a Qt version without the feature, the condition is removed. Change-Id: I18e69eee2b6996233562fbfcf7f29ad619911d8b Reviewed-by: Simon Hausmann --- src/libs/qmljs/parser/qmlerror.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libs/qmljs/parser/qmlerror.cpp b/src/libs/qmljs/parser/qmlerror.cpp index bd4d35af309..5994300182d 100644 --- a/src/libs/qmljs/parser/qmlerror.cpp +++ b/src/libs/qmljs/parser/qmlerror.cpp @@ -315,9 +315,7 @@ QDebug operator<<(QDebug debug, const QmlError &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'));