diff options
Diffstat (limited to 'src/plugins/qmljstools/qmljsplugindumper.cpp')
| -rw-r--r-- | src/plugins/qmljstools/qmljsplugindumper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmljstools/qmljsplugindumper.cpp b/src/plugins/qmljstools/qmljsplugindumper.cpp index e4f853c43e..7388c210d4 100644 --- a/src/plugins/qmljstools/qmljsplugindumper.cpp +++ b/src/plugins/qmljstools/qmljsplugindumper.cpp @@ -135,7 +135,7 @@ static QString makeAbsolute(const QString &path, const QString &base) { if (QFileInfo(path).isAbsolute()) return path; - return QString("%1%2%3").arg(base, QDir::separator(), path); + return QString::fromLatin1("%1%2%3").arg(base, QDir::separator(), path); } void PluginDumper::onLoadPluginTypes(const QString &libraryPath, const QString &importPath, const QString &importUri, const QString &importVersion) @@ -269,7 +269,7 @@ void PluginDumper::qmlPluginTypeDumpDone(int exitCode) if (exitCode != 0) { Core::MessageManager *messageManager = Core::MessageManager::instance(); - const QString errorMessages = process->readAllStandardError(); + const QString errorMessages = QString::fromLocal8Bit(process->readAllStandardError()); messageManager->printToOutputPane(qmldumpErrorMessage(libraryPath, errorMessages)); libraryInfo.setPluginTypeInfoStatus(LibraryInfo::DumpError, qmldumpFailedMessage(libraryPath, errorMessages)); } @@ -309,7 +309,7 @@ void PluginDumper::qmlPluginTypeDumpError(QProcess::ProcessError) return; Core::MessageManager *messageManager = Core::MessageManager::instance(); - const QString errorMessages = process->readAllStandardError(); + const QString errorMessages = QString::fromLocal8Bit(process->readAllStandardError()); messageManager->printToOutputPane(qmldumpErrorMessage(libraryPath, errorMessages)); if (!libraryPath.isEmpty()) { |