diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp index b648995841838a803548667d216c2808be170164..6d10f09a8c0b55de679d547d9c4dc97fa0df79bd 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp @@ -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 COMMAND_LINE_ARGUMENTS_KEY("Qt4ProjectManager.S60DeviceRunConfiguration.CommandLineArguments"); -const int PROGRESS_MAX = 200; +const int PROGRESS_MAX = 200; enum { debug = 0 }; @@ -760,6 +760,9 @@ void S60DeviceRunControl::slotTcftrkEvent(const TcfTrkEvent &event) case TcfTrkEvent::RunControlModuleLoadSuspended: handleModuleLoadSuspended(event); break; + case TcfTrkEvent::LoggingWriteEvent: + handleLogging(event); + break; default: if (debug) qDebug() << __FUNCTION__ << "Event not handled" << event.type(); @@ -769,7 +772,6 @@ void S60DeviceRunControl::slotTcftrkEvent(const TcfTrkEvent &event) void S60DeviceRunControl::initCommunication() { - m_tcfTrkDevice->sendSettingsEnableLogCommand(); m_tcfTrkDevice->sendLoggingAddListenerCommand(TcfTrkCallback(this, &S60DeviceRunControl::handleAddListener)); } @@ -823,6 +825,12 @@ void S60DeviceRunControl::handleModuleLoadSuspended(const TcfTrkEvent &event) 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) { if (debug) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h index 77b7f0427cd9aa8cd4db3e74bb999928601000be..c8e07e4d259cc339ce2e89a6811064aa1a28ac17 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h @@ -177,7 +177,7 @@ protected slots: void deviceRemoved(const SymbianUtils::SymbianDevice &); void reportLaunchFinished(); - void finishRunControl(); + void finishRunControl(); private slots: void processStopped(uint pc, uint pid, uint tid, const QString& reason); @@ -205,6 +205,7 @@ private: void handleContextSuspended(const tcftrk::TcfTrkEvent &event); void handleContextAdded(const tcftrk::TcfTrkEvent &event); void handleContextRemoved(const tcftrk::TcfTrkEvent &event); + void handleLogging(const tcftrk::TcfTrkEvent &event); private: void handleCreateProcess(const tcftrk::TcfTrkCommandResult &result); diff --git a/src/shared/symbianutils/tcftrkmessage.cpp b/src/shared/symbianutils/tcftrkmessage.cpp index feadf98a710d49127865633ebd4a05c00b0b76fb..9b6ca2d7d4059085c4dbea2c8e47562f088fa3ed 100644 --- a/src/shared/symbianutils/tcftrkmessage.cpp +++ b/src/shared/symbianutils/tcftrkmessage.cpp @@ -412,7 +412,7 @@ TcfTrkEvent *TcfTrkEvent::parseEvent(Services s, const QByteArray &nameBA, const } break; 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()); break; default: