From bc466562ece939760e42322dfc0c55201b848938 Mon Sep 17 00:00:00 2001
From: Pawel Polanski <pawel.3.polanski@nokia.com>
Date: Tue, 30 Nov 2010 09:48:03 +0100
Subject: [PATCH] If no Symbian device is connected the deployment process will
be skipped instead of aborting the whole build.
---
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp | 6 +++---
.../qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
index 2b7947510a1..4059a35a21d 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
@@ -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;
}
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index dfb13bc39f3..9d05e8f5a42 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -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;
}
--
GitLab