summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-01-13 14:20:45 +0100
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-01-14 21:13:41 +0100
commit80d3f73319708dc0c185286c6d9f439418ab0305 (patch)
tree56bcdec35c37155f1f271abc74df4ed8fd8768ac /src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
parent2776346db43fa6835e495637bc262c47e3719bc0 (diff)
downloadqt-creator-80d3f73319708dc0c185286c6d9f439418ab0305.tar.gz
Compile Qt4ProjectManager with QT_NO_CAST_FROM_ASCII.
Change-Id: If9fd111032975d2a313084f5fedf20561806e268 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp')
-rw-r--r--src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
index 2153d0046d..caaf445eb0 100644
--- a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
@@ -111,7 +111,7 @@ bool CodaRunControl::isRunning() const
QIcon CodaRunControl::icon() const
{
- return QIcon(ProjectExplorer::Constants::ICON_DEBUG_SMALL);
+ return QIcon(QLatin1String(ProjectExplorer::Constants::ICON_DEBUG_SMALL));
}
bool CodaRunControl::setupLauncher()
@@ -346,7 +346,7 @@ void CodaRunControl::handleFindProcesses(const CodaCommandResult &result)
m_codaDevice->sendProcessStartCommand(CodaCallback(this, &CodaRunControl::handleCreateProcess),
executableName(),
executableUid(),
- commandLineArguments().split(' '),
+ commandLineArguments().split(QLatin1Char(' ')),
QString(),
true);
appendMessage(tr("Launching: %1\n").arg(executableName()), Utils::NormalMessageFormat);
@@ -362,7 +362,7 @@ void CodaRunControl::handleCreateProcess(const CodaCommandResult &result)
Json::JsonValue id = result.values.at(0).findChild("ID");
if (id.isValid()) {
m_state = StateProcessRunning;
- m_runningProcessId = id.data();
+ m_runningProcessId = QLatin1String(id.data());
processCreated = true;
}
}