From d1cd1a490c30850a51f4e8c21b549f50682328a4 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Tue, 24 Jun 2014 14:16:30 +0200 Subject: [PATCH] ios: correctly replace cryptic Locked message when deploying Change-Id: I19e33d5c7e35f9d76c81469d3772bc800ce1760b Reviewed-by: Richard Moe Gustavsen --- src/plugins/ios/iosrunner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp index a7e7a184a17..4f2c14f2328 100644 --- a/src/plugins/ios/iosrunner.cpp +++ b/src/plugins/ios/iosrunner.cpp @@ -217,11 +217,11 @@ void IosRunner::handleErrorMsg(IosToolHandler *handler, const QString &msg) 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(lockedErr)) { + } else if (res.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); + res.replace(lockedErr, message); } QRegExp qmlPortRe(QLatin1String("QML Debugger: Waiting for connection on port ([0-9]+)...")); int index = qmlPortRe.indexIn(msg);