From fae7a9fae7ecbd59c0718a1898e17d21eb31c936 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Wed, 26 May 2010 11:43:19 +0200
Subject: [PATCH] Maemo: Add missing initialization.
Task-number: QTCREATORBUG-1461 (part 1)
Conflicts:
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
---
.../qt4projectmanager/qt-maemo/maemosshthread.cpp | 10 ++++++++--
.../qt4projectmanager/qt-maemo/maemosshthread.h | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
index 4b3ee3beb9c..77777bceee9 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
@@ -104,8 +104,7 @@ bool MaemoSshRunner::runInternal()
createConnection();
connect(m_connection.data(), SIGNAL(remoteOutput(QByteArray)),
this, SLOT(handleRemoteOutput(QByteArray)));
- m_endMarkerCount = 0;
- m_promptEncountered = false;
+ initState();
if (!m_connection->start())
return false;
if (stopRequested())
@@ -115,6 +114,13 @@ bool MaemoSshRunner::runInternal()
return !m_connection->hasError();
}
+void MaemoSshRunner::initState()
+{
+ m_endMarkerCount = 0;
+ m_promptEncountered = false;
+ m_potentialEndMarkerPrefix.clear();
+}
+
void MaemoSshRunner::handleRemoteOutput(const QByteArray &curOutput)
{
const QByteArray output = m_potentialEndMarkerPrefix + curOutput;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h b/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
index a01e1bd7c36..788bc058211 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
@@ -97,6 +97,7 @@ signals:
private:
virtual bool runInternal();
Q_SLOT void handleRemoteOutput(const QByteArray &output);
+ void initState();
static const QByteArray EndMarker;
--
GitLab