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

ios: better deploy messages (and handling of missing devices)

Browse Source 
Change-Id: I77faa28b1300bbf59f56cf20855147f67fd69368
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Fawzi Mohamed
2013-10-07 16:07:16 +02:00
parent dd08503062
commit a874537b0f
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/ios/iosdeploystep.cpp
View File

@@ -90,6 +90,11 @@ bool IosDeployStep::init()
{
QTC_CHECK(m_transferStatus == NoTransfer);
m_device = ProjectExplorer::DeviceKitInformation::device(target()->kit());
if (m_device.isNull()) {
emit addOutput(tr("Error: no device available, deploy failed."),
BuildStep::ErrorMessageOutput);
return false;
}
return true;
}
@@ -114,6 +119,8 @@ void IosDeployStep::run(QFutureInterface<bool> &fi)
SLOT(handleDidTransferApp(Ios::IosToolHandler*,QString,QString,Ios::IosToolHandler::OpStatus)));
connect(toolHandler, SIGNAL(finished(Ios::IosToolHandler*)),
SLOT(handleFinished(Ios::IosToolHandler*)));
connect(toolHandler, SIGNAL(errorMsg(Ios::IosToolHandler*,QString)),
SLOT(handleErrorMsg(Ios::IosToolHandler*,QString)));
toolHandler->requestTransferApp(appBundle(), deviceId());
}
@@ -171,6 +178,12 @@ void IosDeployStep::handleFinished(IosToolHandler *handler)
m_futureInterface.reportFinished();
}
void IosDeployStep::handleErrorMsg(IosToolHandler *handler, const QString &msg)
{
Q_UNUSED(handler);
emit addOutput(msg, BuildStep::ErrorMessageOutput);
}
BuildStepConfigWidget *IosDeployStep::createConfigWidget()
{
return new IosDeployStepWidget(this);