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

Merge remote-tracking branch 'origin/2.3'

Browse Source 
Conflicts:
	share/qtcreator/dumper/bridge.py
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/remotelinux/remotelinuxapplicationrunner.cpp

Change-Id: I444f797723d5879ea08c5c0e1f31158d271d4f41
This commit is contained in:
Oswald Buddenhagen
2011-07-07 12:26:59 +02:00
parent fdb0876e9c 600127e875
commit 1f3896e8af
917 changed files with 13037 additions and 6185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/remotelinux/remotelinuxapplicationrunner.cpp
View File

@@ -375,7 +375,8 @@ void RemoteLinuxApplicationRunner::handleDeviceSetupDone(bool success)
handleConnected();
} else {
emit reportProgress(tr("Connecting to device..."));
m_connection->connectToHost();
if (m_connection->state() == Utils::SshConnection::Unconnected)
m_connection->connectToHost();
}
}