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

Symbian: CODA logging service has been enabled

Browse Source
This commit is contained in:
Pawel Polanski
2011-01-17 11:59:47 +01:00
parent 5aebd173ad
commit 5ca2d6990a
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ const char * const PRO_FILE_KEY("Qt4ProjectManager.S60DeviceRunConfiguration.Pro
const char * const COMMUNICATION_TYPE_KEY("Qt4ProjectManager.S60DeviceRunConfiguration.CommunicationType"); const char * const COMMUNICATION_TYPE_KEY("Qt4ProjectManager.S60DeviceRunConfiguration.CommunicationType");
const char * const COMMAND_LINE_ARGUMENTS_KEY("Qt4ProjectManager.S60DeviceRunConfiguration.CommandLineArguments"); const char * const COMMAND_LINE_ARGUMENTS_KEY("Qt4ProjectManager.S60DeviceRunConfiguration.CommandLineArguments");
const int PROGRESS_MAX = 200; const int PROGRESS_MAX = 200;
enum { debug = 0 }; enum { debug = 0 };
@@ -760,6 +760,9 @@ void S60DeviceRunControl::slotTcftrkEvent(const TcfTrkEvent &event)
case TcfTrkEvent::RunControlModuleLoadSuspended: case TcfTrkEvent::RunControlModuleLoadSuspended:
handleModuleLoadSuspended(event); handleModuleLoadSuspended(event);
break; break;
case TcfTrkEvent::LoggingWriteEvent:
handleLogging(event);
break;
default: default:
if (debug) if (debug)
qDebug() << __FUNCTION__ << "Event not handled" << event.type(); qDebug() << __FUNCTION__ << "Event not handled" << event.type();
@@ -769,7 +772,6 @@ void S60DeviceRunControl::slotTcftrkEvent(const TcfTrkEvent &event)
void S60DeviceRunControl::initCommunication() void S60DeviceRunControl::initCommunication()
{ {
m_tcfTrkDevice->sendSettingsEnableLogCommand();
m_tcfTrkDevice->sendLoggingAddListenerCommand(TcfTrkCallback(this, &S60DeviceRunControl::handleAddListener)); m_tcfTrkDevice->sendLoggingAddListenerCommand(TcfTrkCallback(this, &S60DeviceRunControl::handleAddListener));
} }
@@ -823,6 +825,12 @@ void S60DeviceRunControl::handleModuleLoadSuspended(const TcfTrkEvent &event)
m_tcfTrkDevice->sendRunControlResumeCommand(TcfTrkCallback(), me.id()); m_tcfTrkDevice->sendRunControlResumeCommand(TcfTrkCallback(), me.id());
} }
void S60DeviceRunControl::handleLogging(const TcfTrkEvent &event)
{
const TcfTrkLoggingWriteEvent &me = static_cast<const TcfTrkLoggingWriteEvent &>(event);
appendMessage(me.message(), StdOutFormat);
}
void S60DeviceRunControl::handleAddListener(const TcfTrkCommandResult &result) void S60DeviceRunControl::handleAddListener(const TcfTrkCommandResult &result)
{ {
if (debug) if (debug)

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

@@ -177,7 +177,7 @@ protected slots:
void deviceRemoved(const SymbianUtils::SymbianDevice &); void deviceRemoved(const SymbianUtils::SymbianDevice &);
void reportLaunchFinished(); void reportLaunchFinished();
void finishRunControl(); void finishRunControl();
private slots: private slots:
void processStopped(uint pc, uint pid, uint tid, const QString& reason); void processStopped(uint pc, uint pid, uint tid, const QString& reason);
@@ -205,6 +205,7 @@ private:
void handleContextSuspended(const tcftrk::TcfTrkEvent &event); void handleContextSuspended(const tcftrk::TcfTrkEvent &event);
void handleContextAdded(const tcftrk::TcfTrkEvent &event); void handleContextAdded(const tcftrk::TcfTrkEvent &event);
void handleContextRemoved(const tcftrk::TcfTrkEvent &event); void handleContextRemoved(const tcftrk::TcfTrkEvent &event);
void handleLogging(const tcftrk::TcfTrkEvent &event);
private: private:
void handleCreateProcess(const tcftrk::TcfTrkCommandResult &result); void handleCreateProcess(const tcftrk::TcfTrkCommandResult &result);

2
src/shared/symbianutils/tcftrkmessage.cpp
View File

@@ -412,7 +412,7 @@ TcfTrkEvent *TcfTrkEvent::parseEvent(Services s, const QByteArray &nameBA, const
} }
break; break;
case LoggingService: case LoggingService:
if (nameBA == "write" && values.size() >= 2) if ((nameBA == "writeln" || nameBA == "write" /*not yet used*/) && values.size() >= 2)
return new TcfTrkLoggingWriteEvent(values.at(0).data(), values.at(1).data()); return new TcfTrkLoggingWriteEvent(values.at(0).data(), values.at(1).data());
break; break;
default: default: