From: Pawel Polanski Date: Tue, 5 Apr 2011 14:48:23 +0000 (+0200) Subject: Symbian: fixed a output window bug that came form fixing window related bug X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0cc474230cfdfe8ae51c607b4dea9f5cd2d086bf;p=qt-creator-jp%2Fqt-creator-jp.git Symbian: fixed a output window bug that came form fixing window related bug --- diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp index 09f7cc50df..ea546974fb 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 d0a567dd74..c9d14cee48 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();