Commit bc466562 authored by Pawel Polanski's avatar Pawel Polanski
Browse files

If no Symbian device is connected the deployment process will be skipped...

If no Symbian device is connected the deployment process will be skipped instead of aborting the whole build.
parent 474fecb6
......@@ -145,7 +145,7 @@ bool S60DeployStep::init()
delete m_launcher;
m_launcher = 0;
appendMessage(message, true);
return false;
return true;
}
// Prompt the user to start up the Blue tooth connection
const trk::PromptStartCommunicationResult src =
......@@ -157,7 +157,7 @@ bool S60DeployStep::init()
delete m_launcher;
m_launcher = 0;
appendMessage(message, true);
return false;
return true;
}
return true;
}
......@@ -212,7 +212,7 @@ bool S60DeployStep::processPackageName(QString &errorMessage)
void S60DeployStep::start()
{
if (m_serialPortName.isEmpty()) {
appendMessage(tr("There is no device plugged in."), true);
appendMessage(tr("No device is connected. Please connect a device and try again."), true);
emit finished();
return;
}
......
......@@ -539,7 +539,7 @@ void S60DeviceRunControl::start()
emit started();
if (m_serialPortName.isEmpty()) {
m_launchProgress->reportCanceled();
appendMessage(this, tr("There is no device plugged in."), true);
appendMessage(this, tr("No device is connected. Please connect a device and try again."), true);
emit finished();
return;
}
......
Markdown is supported
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