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

If no Symbian device is connected the deployment process will be skipped instead of aborting the whole build.

Browse Source
This commit is contained in:
Pawel Polanski
2010-11-30 09:48:03 +01:00
parent 474fecb69c
commit bc466562ec
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
View File

@@ -145,7 +145,7 @@ bool S60DeployStep::init()
delete m_launcher; delete m_launcher;
m_launcher = 0; m_launcher = 0;
appendMessage(message, true); appendMessage(message, true);
return false; return true;
} }
// Prompt the user to start up the Blue tooth connection // Prompt the user to start up the Blue tooth connection
const trk::PromptStartCommunicationResult src = const trk::PromptStartCommunicationResult src =
@@ -157,7 +157,7 @@ bool S60DeployStep::init()
delete m_launcher; delete m_launcher;
m_launcher = 0; m_launcher = 0;
appendMessage(message, true); appendMessage(message, true);
return false; return true;
} }
return true; return true;
} }
@@ -212,7 +212,7 @@ bool S60DeployStep::processPackageName(QString &errorMessage)
void S60DeployStep::start() void S60DeployStep::start()
{ {
if (m_serialPortName.isEmpty()) { 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(); emit finished();
return; return;
} }

2
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -539,7 +539,7 @@ void S60DeviceRunControl::start()
emit started(); emit started();
if (m_serialPortName.isEmpty()) { if (m_serialPortName.isEmpty()) {
m_launchProgress->reportCanceled(); 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(); emit finished();
return; return;
} }