feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
	src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
	tests/manual/gdbdebugger/simple/app.cpp
This commit is contained in:
hjk
2010-05-27 11:11:53 +02:00
parent 125aaf8615 0b52a873bd
commit 5805788290
34 changed files with 551 additions and 3031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
View File

@@ -102,8 +102,8 @@ MaemoSshRunner::MaemoSshRunner(const Core::SshServerInfo &server,
bool MaemoSshRunner::runInternal()
{
createConnection();
connect(m_connection.data(), SIGNAL(remoteOutputAvailable()),
this, SLOT(handleRemoteOutput()));
connect(m_connection.data(), SIGNAL(remoteOutput(QByteArray)),
this, SLOT(handleRemoteOutput(QByteArray)));
initState();
if (!m_connection->start())
return false;
@@ -121,7 +121,7 @@ void MaemoSshRunner::initState()
m_potentialEndMarkerPrefix.clear();
}
void MaemoSshRunner::handleRemoteOutput()
void MaemoSshRunner::handleRemoteOutput(const QByteArray &curOutput)
{
const QByteArray output
= m_potentialEndMarkerPrefix + m_connection->waitForRemoteOutput(0);

2
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
View File

@@ -96,7 +96,7 @@ signals:
private:
virtual bool runInternal();
Q_SLOT void handleRemoteOutput();
Q_SLOT void handleRemoteOutput(const QByteArray &output);
void initState();
static const QByteArray EndMarker;