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

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	src/plugins/remotelinux/startgdbserverdialog.cpp

Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
This commit is contained in:
Eike Ziller
2012-03-08 07:48:55 +01:00
parent 3a808b0fd8 62fd2713d0
commit 4b8df15f3d
233 changed files with 1429 additions and 1125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/remotelinux/remotelinuxdebugsupport.cpp
View File

@@ -159,7 +159,7 @@ void AbstractRemoteLinuxDebugSupport::handleAdapterSetupRequested()
QTC_ASSERT(d->state == Inactive, return);
d->state = StartingRunner;
showMessage(tr("Preparing remote side ...\n"), AppStuff);
showMessage(tr("Preparing remote side...\n"), AppStuff);
disconnect(runner(), 0, this, 0);
connect(runner(), SIGNAL(error(QString)), this, SLOT(handleSshError(QString)));
connect(runner(), SIGNAL(readyForExecution()), this, SLOT(startExecution()));