diff options
Diffstat (limited to 'src/plugins')
3 files changed, 14 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp index 9b32aeb92a..22c81c2080 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp @@ -530,7 +530,9 @@ void S60DeployStep::initFileInstallation() { QTC_ASSERT(m_currentFileIndex < m_signedPackages.count(), return); QTC_ASSERT(m_currentFileIndex >= 0, return); - QTC_ASSERT(m_codaDevice, return); + + if (!m_codaDevice) + return; QString packageName(QFileInfo(m_signedPackages.at(m_currentFileIndex)).fileName()); QString remoteFileLocation = QString::fromLatin1("%1:\\Data\\%2").arg(m_installationDrive).arg(packageName); @@ -602,7 +604,8 @@ void S60DeployStep::handleSymbianInstall(const Coda::CodaCommandResult &result) void S60DeployStep::putSendNextChunk() { - QTC_ASSERT(m_codaDevice, return); + if (!m_codaDevice) + return; // Read and send off next chunk const quint64 pos = m_putFile->pos(); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp index 11e35fcd3c..79b78b4c62 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp @@ -516,6 +516,14 @@ bool S60DeviceDebugRunControl::promptToStop(bool *) const return Debugger::DebuggerRunControl::promptToStop(0); } +void S60DeviceDebugRunControl::appendMessage(const QString &msg, ProjectExplorer::OutputFormat format, bool addNewLine) +{ + if (addNewLine) + RunControl::appendMessage(msg + '\n', format); + else + RunControl::appendMessage(msg, format); +} + S60DeviceDebugRunControlFactory::S60DeviceDebugRunControlFactory(QObject *parent) : IRunControlFactory(parent) { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h index 9a815dab7d..6411907fd5 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h @@ -140,6 +140,7 @@ public: const QPair<Debugger::DebuggerEngineType, Debugger::DebuggerEngineType> &masterSlaveEngineTypes); virtual void start(); virtual bool promptToStop(bool *optionalPrompt = 0) const; + virtual void appendMessage(const QString &msg, ProjectExplorer::OutputFormat format, bool addNewLine=true); }; class S60DeviceDebugRunControlFactory : public ProjectExplorer::IRunControlFactory |