From 799c624caf55060e82d28be092645804f42f9af5 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 22 Apr 2010 12:29:20 +0200
Subject: [PATCH] Fix trk-Launcher output connection.
---
.../qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp | 5 +++++
.../qt4projectmanager/qt-s60/s60devicerunconfiguration.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 5f5fe0cc13e..54d08018bbc 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -785,6 +785,11 @@ void S60DeviceRunControlBase::slotWaitingForTrkClosed()
}
}
+void S60DeviceRunControlBase::printApplicationOutput(const QString &output)
+{
+ printApplicationOutput(output, false);
+}
+
void S60DeviceRunControlBase::printApplicationOutput(const QString &output, bool onStdErr)
{
emit addToOutputWindowInline(this, output, onStdErr);
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
index 25603e972e0..3ff0bc145af 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
@@ -162,6 +162,7 @@ protected:
protected slots:
void printApplicationOutput(const QString &output, bool onStdErr);
+ void printApplicationOutput(const QString &output);
void deviceRemoved(const SymbianUtils::SymbianDevice &);
private slots:
--
GitLab