From 96d20a2fa1fae4621c644953d84e225118f3e371 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 16 Jan 2013 09:39:00 +0100 Subject: [PATCH] Compile fix for QT_NO_CAST_FROM_ASCII/ Qt 5. Fixes breakage introduced by 88267a3299dd1414b1889028e35917841d47fdcc. Change-Id: I9615285eb4ea2e0c07ecc207d752da53b54da106 Reviewed-by: Friedemann Kleint --- src/tools/qtcreatorcrashhandler/backtracecollector.cpp | 2 +- src/tools/qtcreatorcrashhandler/crashhandler.cpp | 6 +++--- src/tools/qtcreatorcrashhandler/main.cpp | 2 +- src/tools/sdktool/rmkeysoperation.cpp | 4 ++-- src/tools/sdktool/rmkitoperation.cpp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/tools/qtcreatorcrashhandler/backtracecollector.cpp b/src/tools/qtcreatorcrashhandler/backtracecollector.cpp index e62e2432c14..c275dc2af34 100644 --- a/src/tools/qtcreatorcrashhandler/backtracecollector.cpp +++ b/src/tools/qtcreatorcrashhandler/backtracecollector.cpp @@ -122,7 +122,7 @@ QString BacktraceCollector::createTemporaryCommandFile() void BacktraceCollector::onDebuggerOutputAvailable() { - const QString newChunk = d->debugger.readAll(); + const QString newChunk = QString::fromLocal8Bit(d->debugger.readAll()); d->output.append(newChunk); emit backtraceChunk(newChunk); } diff --git a/src/tools/qtcreatorcrashhandler/crashhandler.cpp b/src/tools/qtcreatorcrashhandler/crashhandler.cpp index 7521802716d..c0247ff8ff9 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandler.cpp +++ b/src/tools/qtcreatorcrashhandler/crashhandler.cpp @@ -90,7 +90,7 @@ class CrashHandlerPrivate public: CrashHandlerPrivate(pid_t pid, const QString &signalName, CrashHandler *crashHandler) : pid(pid), - creatorInPath(Utils::Environment::systemEnvironment().searchInPath(QtCreatorExecutable)), + creatorInPath(Utils::Environment::systemEnvironment().searchInPath(QLatin1String(QtCreatorExecutable))), dialog(crashHandler, signalName) {} const pid_t pid; @@ -161,7 +161,7 @@ void CrashHandler::onBacktraceFinished(const QString &backtrace) // ... // Thread 1 (Thread 0x7f1c33c79780 (LWP 975)): // ... - QRegExp rx("\\[Current thread is (\\d+)"); + QRegExp rx(QLatin1String("\\[Current thread is (\\d+)")); const int pos = rx.indexIn(backtrace); if (pos == -1) return; @@ -172,7 +172,7 @@ void CrashHandler::onBacktraceFinished(const QString &backtrace) void CrashHandler::openBugTracker() { - QDesktopServices::openUrl(QUrl(URL_BUGTRACKER)); + QDesktopServices::openUrl(QUrl(QLatin1String(URL_BUGTRACKER))); } bool CrashHandler::collectRestartAppData() diff --git a/src/tools/qtcreatorcrashhandler/main.cpp b/src/tools/qtcreatorcrashhandler/main.cpp index 623520cf228..02b47f12494 100644 --- a/src/tools/qtcreatorcrashhandler/main.cpp +++ b/src/tools/qtcreatorcrashhandler/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) Q_PID parentPid = getppid(); QString parentExecutable = QFile::symLinkTarget(QString::fromLatin1("/proc/%1/exe") .arg(QString::number(parentPid))); - if (argc > 2 || !parentExecutable.contains("qtcreator")) { + if (argc > 2 || !parentExecutable.contains(QLatin1String("qtcreator"))) { QTextStream err(stderr); err << QString::fromLatin1("This crash handler will be called by Qt Creator itself. " "Do not call this manually.\n"); diff --git a/src/tools/sdktool/rmkeysoperation.cpp b/src/tools/sdktool/rmkeysoperation.cpp index a18b0a45dc1..f6de39c60d4 100644 --- a/src/tools/sdktool/rmkeysoperation.cpp +++ b/src/tools/sdktool/rmkeysoperation.cpp @@ -113,7 +113,7 @@ bool RmKeysOperation::test() const return false; data.clear(); - data.append("subkeys/subsubkeys"); + data.append(QLatin1String("subkeys/subsubkeys")); result = rmKeys(testMap, data); if (result.count() != 3 @@ -131,7 +131,7 @@ bool RmKeysOperation::test() const return false; data.clear(); - data.append("subkeys/testbool"); + data.append(QLatin1String("subkeys/testbool")); result = rmKeys(testMap, data); if (result.count() != 3 diff --git a/src/tools/sdktool/rmkitoperation.cpp b/src/tools/sdktool/rmkitoperation.cpp index 417c8f7d874..e9f6b4b074e 100644 --- a/src/tools/sdktool/rmkitoperation.cpp +++ b/src/tools/sdktool/rmkitoperation.cpp @@ -115,7 +115,7 @@ bool RmKitOperation::test() const QVariantMap result = rmKit(map, QLatin1String("testId")); if (result.count() != 4 - || !result.contains("Profile.0") + || !result.contains(QLatin1String("Profile.0")) || !result.contains(QLatin1String(COUNT)) || result.value(QLatin1String(COUNT)).toInt() != 1 || !result.contains(QLatin1String(DEFAULT)) @@ -130,7 +130,7 @@ bool RmKitOperation::test() const result = rmKit(map, QLatin1String("testId2")); if (result.count() != 4 - || !result.contains("Profile.0") + || !result.contains(QLatin1String("Profile.0")) || !result.contains(QLatin1String(COUNT)) || result.value(QLatin1String(COUNT)).toInt() != 1 || !result.contains(QLatin1String(DEFAULT))