From 0cc474230cfdfe8ae51c607b4dea9f5cd2d086bf Mon Sep 17 00:00:00 2001 From: Pawel Polanski Date: Tue, 5 Apr 2011 16:48:23 +0200 Subject: [PATCH] Symbian: fixed a output window bug that came form fixing window related bug --- .../qt4projectmanager/qt-s60/s60runcontrolbase.cpp | 8 ++++++++ src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp index 09f7cc50df8..ea546974fb2 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp @@ -252,3 +252,11 @@ char S60RunControlBase::installationDrive() const { return m_installationDrive; } + +void S60RunControlBase::appendMessage(const QString &msg, ProjectExplorer::OutputFormat format, bool addNewLine) +{ + if (addNewLine) + RunControl::appendMessage(msg + '\n', format); + else + RunControl::appendMessage(msg, format); +} diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h index d0a567dd74a..c9d14cee484 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h @@ -78,8 +78,10 @@ protected: private: void startLaunching(); + protected slots: void reportLaunchFinished(); + void appendMessage(const QString &msg, ProjectExplorer::OutputFormat format, bool addNewLine=true); private slots: void handleFinished();