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

iOS: Write "error" and "simulator" in lower case in messages

Browse Source 
Change-Id: I20d2266b2f40dc19b367e7704b72977a84814c3c
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Leena Miettinen
2017-07-28 10:02:59 +02:00
parent d0093ad631
commit 6c25c67b98
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/ios/iostoolhandler.cpp
View File

@@ -396,7 +396,7 @@ void IosToolHandlerPrivate::toolExited(int code)
void IosDeviceToolHandlerPrivate::subprocessError(QProcess::ProcessError error) void IosDeviceToolHandlerPrivate::subprocessError(QProcess::ProcessError error)
{ {
if (state != Stopped) if (state != Stopped)
errorMsg(IosToolHandler::tr("iOS tool Error %1").arg(error)); errorMsg(IosToolHandler::tr("iOS tool error %1").arg(error));
stop(-1); stop(-1);
if (error == QProcess::FailedToStart) { if (error == QProcess::FailedToStart) {
qCDebug(toolHandlerLog) << "IosToolHandler::finished(" << this << ")"; qCDebug(toolHandlerLog) << "IosToolHandler::finished(" << this << ")";
@@ -837,7 +837,7 @@ void IosSimulatorToolHandlerPrivate::requestTransferApp(const QString &appBundle
if (response.success) { if (response.success) {
installAppOnSimulator(); installAppOnSimulator();
} else { } else {
errorMsg(IosToolHandler::tr("Application install on Simulator failed. Simulator not running.")); errorMsg(IosToolHandler::tr("Application install on simulator failed. Simulator not running."));
didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Failure); didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Failure);
emit q->finished(q); emit q->finished(q);
} }
@@ -862,7 +862,7 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
Utils::FileName appBundle = Utils::FileName::fromString(m_bundlePath); Utils::FileName appBundle = Utils::FileName::fromString(m_bundlePath);
if (!appBundle.exists()) { if (!appBundle.exists()) {
errorMsg(IosToolHandler::tr("Application launch on Simulator failed. Invalid Bundle path %1") errorMsg(IosToolHandler::tr("Application launch on simulator failed. Invalid bundle path %1")
.arg(m_bundlePath)); .arg(m_bundlePath));
didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure); didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure);
return; return;
@@ -874,7 +874,7 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
if (response.success) { if (response.success) {
launchAppOnSimulator(extraArgs); launchAppOnSimulator(extraArgs);
} else { } else {
errorMsg(IosToolHandler::tr("Application launch on Simulator failed. Simulator not running.")); errorMsg(IosToolHandler::tr("Application launch on simulator failed. Simulator not running."));
didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure); didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure);
} }
}; };
@@ -926,7 +926,7 @@ void IosSimulatorToolHandlerPrivate::installAppOnSimulator()
isTransferringApp(m_bundlePath, m_deviceId, 100, 100, ""); isTransferringApp(m_bundlePath, m_deviceId, 100, 100, "");
didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Success); didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Success);
} else { } else {
errorMsg(IosToolHandler::tr("Application install on Simulator failed. %1") errorMsg(IosToolHandler::tr("Application install on simulator failed. %1")
.arg(QString::fromLocal8Bit(response.commandOutput))); .arg(QString::fromLocal8Bit(response.commandOutput)));
didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Failure); didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Failure);
} }
@@ -990,7 +990,7 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext
stderrFile); stderrFile);
} else { } else {
m_pid = -1; m_pid = -1;
errorMsg(IosToolHandler::tr("Application launch on Simulator failed. %1") errorMsg(IosToolHandler::tr("Application launch on simulator failed. %1")
.arg(QString::fromLocal8Bit(response.commandOutput))); .arg(QString::fromLocal8Bit(response.commandOutput)));
didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure); didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure);
stop(-1); stop(-1);