Maemo: Fix botched merge.

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);

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;