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

ios: correctly replace cryptic Locked message when deploying

Browse Source 
Change-Id: I19e33d5c7e35f9d76c81469d3772bc800ce1760b
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-06-24 14:16:30 +02:00
parent 1fd6a4a80a
commit d1cd1a490c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/ios/iosrunner.cpp
View File

@@ -217,11 +217,11 @@ void IosRunner::handleErrorMsg(IosToolHandler *handler, const QString &msg)
TaskHub::addTask(Task::Warning, TaskHub::addTask(Task::Warning,
tr("Run failed. The settings in the Organizer window of Xcode might be incorrect."), tr("Run failed. The settings in the Organizer window of Xcode might be incorrect."),
ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT); ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT);
} else if (msg.contains(lockedErr)) { } else if (res.contains(lockedErr)) {
QString message = tr("The device is locked, please unlock."); QString message = tr("The device is locked, please unlock.");
TaskHub::addTask(Task::Error, message, TaskHub::addTask(Task::Error, message,
ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT); 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]+)...")); QRegExp qmlPortRe(QLatin1String("QML Debugger: Waiting for connection on port ([0-9]+)..."));
int index = qmlPortRe.indexIn(msg); int index = qmlPortRe.indexIn(msg);