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

RemoteLinux: Prepare for other kinds of analyzers

Browse Source 
Rename the "GatheringPorts" stage to the more generic
"GatheringResources", and don't do it by default on
handleRemoteSetupRequested(). Also, drop a few asserts that tested
specifically for QML Profiler.

Change-Id: I53c3182d237f53e6dda20cd1c856e7e5f951e90e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-04-19 16:51:30 +02:00
parent d4f5cab923
commit 03acd1fbf3
4 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,12 +103,12 @@ void LinuxDeviceDebugSupport::handleRemoteSetupRequested()
QTC_ASSERT(state() == Inactive, return);
showMessage(tr("Checking available ports...") + QLatin1Char('\n'), LogStatus);
AbstractRemoteLinuxRunSupport::handleRemoteSetupRequested();
startPortsGathering();
}
void LinuxDeviceDebugSupport::startExecution()
{
QTC_ASSERT(state() == GatheringPorts, return);
QTC_ASSERT(state() == GatheringResources, return);
if (d->cppDebugging && !setPort(d->gdbServerPort))
return;
@@ -202,7 +202,7 @@ void LinuxDeviceDebugSupport::handleRemoteOutput(const QByteArray &output)
void LinuxDeviceDebugSupport::handleRemoteErrorOutput(const QByteArray &output)
{
QTC_ASSERT(state() != GatheringPorts, return);
QTC_ASSERT(state() != GatheringResources, return);
if (!d->runControl)
return;