feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Compile fix for QT_NO_CAST_FROM_ASCII/ Qt 5.

Browse Source 
Fixes breakage introduced by
88267a3299.

Change-Id: I9615285eb4ea2e0c07ecc207d752da53b54da106
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Friedemann Kleint
2013-01-16 09:39:00 +01:00
committed by Orgad Shaneh
parent 88267a3299
commit 96d20a2fa1
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/qtcreatorcrashhandler/backtracecollector.cpp
View File

@@ -122,7 +122,7 @@ QString BacktraceCollector::createTemporaryCommandFile()
void BacktraceCollector::onDebuggerOutputAvailable() void BacktraceCollector::onDebuggerOutputAvailable()
{ {
const QString newChunk = d->debugger.readAll(); const QString newChunk = QString::fromLocal8Bit(d->debugger.readAll());
d->output.append(newChunk); d->output.append(newChunk);
emit backtraceChunk(newChunk); emit backtraceChunk(newChunk);
} }

6
src/tools/qtcreatorcrashhandler/crashhandler.cpp
View File

@@ -90,7 +90,7 @@ class CrashHandlerPrivate
public: public:
CrashHandlerPrivate(pid_t pid, const QString &signalName, CrashHandler *crashHandler) CrashHandlerPrivate(pid_t pid, const QString &signalName, CrashHandler *crashHandler)
: pid(pid), : pid(pid),
creatorInPath(Utils::Environment::systemEnvironment().searchInPath(QtCreatorExecutable)), creatorInPath(Utils::Environment::systemEnvironment().searchInPath(QLatin1String(QtCreatorExecutable))),
dialog(crashHandler, signalName) {} dialog(crashHandler, signalName) {}
const pid_t pid; const pid_t pid;
@@ -161,7 +161,7 @@ void CrashHandler::onBacktraceFinished(const QString &backtrace)
// ... // ...
// Thread 1 (Thread 0x7f1c33c79780 (LWP 975)): // 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); const int pos = rx.indexIn(backtrace);
if (pos == -1) if (pos == -1)
return; return;
@@ -172,7 +172,7 @@ void CrashHandler::onBacktraceFinished(const QString &backtrace)
void CrashHandler::openBugTracker() void CrashHandler::openBugTracker()
{ {
QDesktopServices::openUrl(QUrl(URL_BUGTRACKER)); QDesktopServices::openUrl(QUrl(QLatin1String(URL_BUGTRACKER)));
} }
bool CrashHandler::collectRestartAppData() bool CrashHandler::collectRestartAppData()

2
src/tools/qtcreatorcrashhandler/main.cpp
View File

@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
Q_PID parentPid = getppid(); Q_PID parentPid = getppid();
QString parentExecutable = QFile::symLinkTarget(QString::fromLatin1("/proc/%1/exe") QString parentExecutable = QFile::symLinkTarget(QString::fromLatin1("/proc/%1/exe")
.arg(QString::number(parentPid))); .arg(QString::number(parentPid)));
if (argc > 2 || !parentExecutable.contains("qtcreator")) { if (argc > 2 || !parentExecutable.contains(QLatin1String("qtcreator"))) {
QTextStream err(stderr); QTextStream err(stderr);
err << QString::fromLatin1("This crash handler will be called by Qt Creator itself. " err << QString::fromLatin1("This crash handler will be called by Qt Creator itself. "
"Do not call this manually.\n"); "Do not call this manually.\n");

4
src/tools/sdktool/rmkeysoperation.cpp
View File

@@ -113,7 +113,7 @@ bool RmKeysOperation::test() const
return false; return false;
data.clear(); data.clear();
data.append("subkeys/subsubkeys"); data.append(QLatin1String("subkeys/subsubkeys"));
result = rmKeys(testMap, data); result = rmKeys(testMap, data);
if (result.count() != 3 if (result.count() != 3
@@ -131,7 +131,7 @@ bool RmKeysOperation::test() const
return false; return false;
data.clear(); data.clear();
data.append("subkeys/testbool"); data.append(QLatin1String("subkeys/testbool"));
result = rmKeys(testMap, data); result = rmKeys(testMap, data);
if (result.count() != 3 if (result.count() != 3

4
src/tools/sdktool/rmkitoperation.cpp
View File

@@ -115,7 +115,7 @@ bool RmKitOperation::test() const
QVariantMap result = rmKit(map, QLatin1String("testId")); QVariantMap result = rmKit(map, QLatin1String("testId"));
if (result.count() != 4 if (result.count() != 4
|| !result.contains("Profile.0") || !result.contains(QLatin1String("Profile.0"))
|| !result.contains(QLatin1String(COUNT)) || !result.contains(QLatin1String(COUNT))
|| result.value(QLatin1String(COUNT)).toInt() != 1 || result.value(QLatin1String(COUNT)).toInt() != 1
|| !result.contains(QLatin1String(DEFAULT)) || !result.contains(QLatin1String(DEFAULT))
@@ -130,7 +130,7 @@ bool RmKitOperation::test() const
result = rmKit(map, QLatin1String("testId2")); result = rmKit(map, QLatin1String("testId2"));
if (result.count() != 4 if (result.count() != 4
|| !result.contains("Profile.0") || !result.contains(QLatin1String("Profile.0"))
|| !result.contains(QLatin1String(COUNT)) || !result.contains(QLatin1String(COUNT))
|| result.value(QLatin1String(COUNT)).toInt() != 1 || result.value(QLatin1String(COUNT)).toInt() != 1
|| !result.contains(QLatin1String(DEFAULT)) || !result.contains(QLatin1String(DEFAULT))