diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-11-21 22:43:22 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-22 08:53:45 +0100 |
| commit | 75a3728254bc4016451038d519e7d078304e585a (patch) | |
| tree | 73f430a4ca9f209ad859f480064b5d33e0d5b784 /src/plugins/qmljstools/qmljsplugindumper.cpp | |
| parent | cdf5a10d4e1d6b08cea3abe1f010d54eef28d3dd (diff) | |
| download | qt-creator-75a3728254bc4016451038d519e7d078304e585a.tar.gz | |
QmlJSTools: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I370075ce75682ea11790a8f91339a01fb3c247f9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
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()) { |