diff --git a/src/libs/qmljs/qmljssimplereader.cpp b/src/libs/qmljs/qmljssimplereader.cpp index ea0a93eb2c8..253ba7017ec 100644 --- a/src/libs/qmljs/qmljssimplereader.cpp +++ b/src/libs/qmljs/qmljssimplereader.cpp @@ -127,7 +127,7 @@ bool SimpleAbstractStreamReader::readFile(const QString &fileName) if (file.open(QIODevice::ReadOnly)) { QByteArray source = file.readAll(); file.close(); - return readFromSource(source); + return readFromSource(QString::fromLocal8Bit(source)); } addError(tr("Cannot find file %1").arg(fileName)); return false; diff --git a/src/plugins/qmljstools/qmlconsoleview.cpp b/src/plugins/qmljstools/qmlconsoleview.cpp index a78b2c9b377..9640828463c 100644 --- a/src/plugins/qmljstools/qmlconsoleview.cpp +++ b/src/plugins/qmljstools/qmlconsoleview.cpp @@ -106,7 +106,7 @@ QmlConsoleView::QmlConsoleView(QWidget *parent) : #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) if (baseName == QLatin1String("windows")) { // Sometimes we get the standard windows 95 style as a fallback - if (QStyleFactory::keys().contains("Fusion")) + if (QStyleFactory::keys().contains(QLatin1String("Fusion"))) baseName = QLatin1String("fusion"); // Qt5 else { // Qt4 // e.g. if we are running on a KDE4 desktop