From 91a85960240a1ac4edabe8a18db902501738538c Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Mon, 24 Mar 2014 10:53:26 +0100 Subject: [PATCH] ios: translate locked message in output Change-Id: Ia43fec6716761b40be35e5bfebd453b7a6eabcd7 Reviewed-by: Fawzi Mohamed --- src/plugins/ios/iosrunner.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp index eb192df971f..bf60662b63e 100644 --- a/src/plugins/ios/iosrunner.cpp +++ b/src/plugins/ios/iosrunner.cpp @@ -211,17 +211,20 @@ void IosRunner::handleAppOutput(IosToolHandler *handler, const QString &output) void IosRunner::handleErrorMsg(IosToolHandler *handler, const QString &msg) { Q_UNUSED(handler); - if (msg.contains(QLatin1String("AMDeviceStartService returned -402653150"))) + QString res(msg); + QLatin1String lockedErr = QLatin1String("Unexpected reply: ELocked (454c6f636b6564) vs OK (4f4b)"); + if (msg.contains(QLatin1String("AMDeviceStartService returned -402653150"))) { TaskHub::addTask(Task::Warning, tr("Run failed. The settings in the Organizer window of Xcode might be incorrect."), ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT); - else if (msg.contains(QLatin1String("Unexpected reply: ELocked (454c6f636b6564) vs OK (4f4b)"))) - TaskHub::addTask(Task::Error, - tr("The device is locked, please unlock."), + } else if (msg.contains(lockedErr)) { + QString message = tr("The device is locked, please unlock."); + TaskHub::addTask(Task::Error, message, ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT); + res.replace(lockedErr, msg); + } QRegExp qmlPortRe(QLatin1String("QML Debugger: Waiting for connection on port ([0-9]+)...")); int index = qmlPortRe.indexIn(msg); - QString res(msg); if (index != -1 && m_qmlPort) res.replace(qmlPortRe.cap(1), QString::number(m_qmlPort)); emit errorMsg(res);