diff options
| author | Marco Benelli <marco.benelli@qt.io> | 2017-03-23 12:30:06 +0100 |
|---|---|---|
| committer | Marco Benelli <marco.benelli@qt.io> | 2017-03-23 14:30:26 +0000 |
| commit | 24ff3a2cbd0c73d1f11c3f0f5a07547446b073a6 (patch) | |
| tree | 54b13d686c294035414998ca8f3fd74af091da43 | |
| parent | 61d30a20ce5086badd19c6cc6696387290d6f642 (diff) | |
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 <simon.hausmann@qt.io>
| -rw-r--r-- | src/libs/qmljs/parser/qmlerror.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libs/qmljs/parser/qmlerror.cpp b/src/libs/qmljs/parser/qmlerror.cpp index bd4d35af30..5994300182 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')); |