Commit 824d0425 authored by Tobias Nätterlund's avatar Tobias Nätterlund Committed by Tobias Hunger
Browse files

QNX: Fixed crashes when no BlackBerry device is selected in the kit used



Change-Id: Ic3059a0dd128bc66495f3288bbf1982f81d023d6
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
parent 2c3fe560
......@@ -157,6 +157,9 @@ ProjectExplorer::BuildStepConfigWidget *BlackBerryCreatePackageStep::createConfi
QString BlackBerryCreatePackageStep::debugToken() const
{
BlackBerryDeviceConfiguration::ConstPtr device = BlackBerryDeviceConfiguration::device(target()->kit());
if (!device)
return QString();
return device->debugToken();
}
......
......@@ -90,6 +90,9 @@ BlackBerryDeployInformation *BlackBerryDeployConfiguration::deploymentInfo() con
QString BlackBerryDeployConfiguration::deviceHost() const
{
BlackBerryDeviceConfiguration::ConstPtr device = BlackBerryDeviceConfiguration::device(target()->kit());
if (!device)
return QString();
return device->sshParameters().host;
}
......@@ -102,6 +105,9 @@ QString BlackBerryDeployConfiguration::password() const
QString BlackBerryDeployConfiguration::deviceName() const
{
BlackBerryDeviceConfiguration::ConstPtr device = BlackBerryDeviceConfiguration::device(target()->kit());
if (!device)
return QString();
return device->displayName();
}
......
......@@ -66,6 +66,10 @@ bool BlackBerryRunControlFactory::canRun(ProjectExplorer::RunConfiguration *runC
if (!rc)
return false;
BlackBerryDeviceConfiguration::ConstPtr device = BlackBerryDeviceConfiguration::device(rc->target()->kit());
if (!device)
return false;
// The device can only run the same application once, any subsequent runs will
// not launch a second instance. Disable the Run button if the application is already
// running on the device.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment