diff options
| author | Eike Ziller <[email protected]> | 2018-05-28 16:10:23 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2018-05-28 16:10:23 +0200 |
| commit | c8c6b28e225c17d1ec9a0d9ce13220a610cfa7c7 (patch) | |
| tree | 4abcf5b716f2f3bad7cde28df67bf4ae18ca3500 /src/plugins/debugger/debuggerplugin.cpp | |
| parent | 005b0c1147813aa518a617b31cab3ecec058618a (diff) | |
| parent | c1c57f0c383f88451d1b6c8fe83caa6f2f071048 (diff) | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
Change-Id: I192b9e88f967182f3275b4b98abed1220c26daac
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 1a0e97db454..a651726970b 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -100,7 +100,6 @@ #include <projectexplorer/projectexplorersettings.h> #include <projectexplorer/projecttree.h> #include <projectexplorer/runconfiguration.h> -#include <projectexplorer/runnables.h> #include <projectexplorer/session.h> #include <projectexplorer/target.h> #include <projectexplorer/taskhub.h> @@ -3000,11 +2999,8 @@ void DebuggerPluginPrivate::extensionsInitialized() auto constraint = [](RunConfiguration *runConfig) { Runnable runnable = runConfig->runnable(); - if (runnable.is<StandardRunnable>()) { - IDevice::ConstPtr device = runnable.as<StandardRunnable>().device; - if (device && device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) - return true; - } + if (runnable.device && runnable.device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) + return true; if (DeviceTypeKitInformation::deviceTypeId(runConfig->target()->kit()) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) @@ -3639,7 +3635,7 @@ void DebuggerUnitTests::testStateMachine() auto runControl = new RunControl(rc, ProjectExplorer::Constants::DEBUG_RUN_MODE); auto debugger = new DebuggerRunTool(runControl); - debugger->setInferior(rc->runnable().as<StandardRunnable>()); + debugger->setInferior(rc->runnable()); debugger->setTestCase(TestNoBoundsOfCurrentFunction); connect(debugger, &DebuggerRunTool::stopped, |