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

Symbian: fix in the Debugger's output texts

Browse Source
This commit is contained in:
Pawel Polanski
2011-04-12 16:38:58 +02:00
parent 9e0a51bf8c
commit ffd5d69e76
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -530,7 +530,9 @@ void S60DeployStep::initFileInstallation()
{ {
QTC_ASSERT(m_currentFileIndex < m_signedPackages.count(), return); QTC_ASSERT(m_currentFileIndex < m_signedPackages.count(), return);
QTC_ASSERT(m_currentFileIndex >= 0, 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 packageName(QFileInfo(m_signedPackages.at(m_currentFileIndex)).fileName());
QString remoteFileLocation = QString::fromLatin1("%1:\\Data\\%2").arg(m_installationDrive).arg(packageName); 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() void S60DeployStep::putSendNextChunk()
{ {
QTC_ASSERT(m_codaDevice, return); if (!m_codaDevice)
return;
// Read and send off next chunk // Read and send off next chunk
const quint64 pos = m_putFile->pos(); const quint64 pos = m_putFile->pos();

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

@@ -516,6 +516,14 @@ bool S60DeviceDebugRunControl::promptToStop(bool *) const
return Debugger::DebuggerRunControl::promptToStop(0); 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) : S60DeviceDebugRunControlFactory::S60DeviceDebugRunControlFactory(QObject *parent) :
IRunControlFactory(parent) IRunControlFactory(parent)
{ {

1
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
View File

@@ -140,6 +140,7 @@ public:
const QPair<Debugger::DebuggerEngineType, Debugger::DebuggerEngineType> &masterSlaveEngineTypes); const QPair<Debugger::DebuggerEngineType, Debugger::DebuggerEngineType> &masterSlaveEngineTypes);
virtual void start(); virtual void start();
virtual bool promptToStop(bool *optionalPrompt = 0) const; virtual bool promptToStop(bool *optionalPrompt = 0) const;
virtual void appendMessage(const QString &msg, ProjectExplorer::OutputFormat format, bool addNewLine=true);
}; };
class S60DeviceDebugRunControlFactory : public ProjectExplorer::IRunControlFactory class S60DeviceDebugRunControlFactory : public ProjectExplorer::IRunControlFactory