From e2d338ee221e454ffd9615679a3055d8f3578e08 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Tue, 1 Jun 2010 17:22:50 +0200
Subject: [PATCH] Maemo: Fix botched merge.
---
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp | 6 +++---
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
index f2267d83f5c..a31c06dec4e 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
@@ -102,8 +102,8 @@ MaemoSshRunner::MaemoSshRunner(const Core::SshServerInfo &server,
bool MaemoSshRunner::runInternal()
{
createConnection();
- connect(m_connection.data(), SIGNAL(remoteOutput(QByteArray)),
- this, SLOT(handleRemoteOutput(QByteArray)));
+ connect(m_connection.data(), SIGNAL(remoteOutputAvailable()),
+ this, SLOT(handleRemoteOutput()));
initState();
if (!m_connection->start())
return false;
@@ -121,7 +121,7 @@ void MaemoSshRunner::initState()
m_potentialEndMarkerPrefix.clear();
}
-void MaemoSshRunner::handleRemoteOutput(const QByteArray &curOutput)
+void MaemoSshRunner::handleRemoteOutput()
{
const QByteArray output
= m_potentialEndMarkerPrefix + m_connection->waitForRemoteOutput(0);
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h b/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
index 788bc058211..79107d0f602 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
@@ -96,7 +96,7 @@ signals:
private:
virtual bool runInternal();
- Q_SLOT void handleRemoteOutput(const QByteArray &output);
+ Q_SLOT void handleRemoteOutput();
void initState();
static const QByteArray EndMarker;
--
GitLab