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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	src/plugins/ios/iosdeploystep.cpp

Change-Id: I97c80d288d7af30f4bf64509a09e0fe2e3b85f6f
This commit is contained in:
Eike Ziller
2014-05-20 14:44:31 +02:00
parent 049a10fa40 88d76de059
commit 270e8fe537
12 changed files with 87 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,7 @@ bool IosDeployStep::init()
m_device = ProjectExplorer::DeviceKitInformation::device(target()->kit());
IosRunConfiguration * runConfig = qobject_cast<IosRunConfiguration *>(
this->target()->activeRunConfiguration());
QTC_CHECK(runConfig);
QTC_ASSERT(runConfig, return false);
m_bundlePath = runConfig->bundleDirectory().toString();
if (m_device.isNull()) {
emit addOutput(tr("Error: no device available, deploy failed."),