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

Move DebuggerRunConfigurationAspect into Debugger

Browse Source 
Change-Id: I03cab5d963a6d7c77171efe360a552d8109f6a8b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-03-27 13:03:15 +01:00
parent e474b6ed8f
commit 533644290f
28 changed files with 391 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/androiddebugsupport.cpp
View File

@@ -37,6 +37,7 @@
#include <debugger/debuggerengine.h>
#include <debugger/debuggerplugin.h>
#include <debugger/debuggerkitinformation.h>
#include <debugger/debuggerrunconfigurationaspect.h>
#include <debugger/debuggerrunner.h>
#include <debugger/debuggerstartparameters.h>
@@ -91,8 +92,8 @@ RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration *
params.displayName = AndroidManager::packageName(target);
params.remoteSetupNeeded = true;
ProjectExplorer::DebuggerRunConfigurationAspect *aspect
= runConfig->extraAspect<ProjectExplorer::DebuggerRunConfigurationAspect>();
Debugger::DebuggerRunConfigurationAspect *aspect
= runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>();
if (aspect->useCppDebugger()) {
params.languages |= CppLanguage;
Kit *kit = target->kit();
@@ -133,8 +134,8 @@ AndroidDebugSupport::AndroidDebugSupport(AndroidRunConfiguration *runConfig,
m_gdbServerPort(5039),
m_qmlPort(0)
{
ProjectExplorer::DebuggerRunConfigurationAspect *aspect
= runConfig->extraAspect<ProjectExplorer::DebuggerRunConfigurationAspect>();
Debugger::DebuggerRunConfigurationAspect *aspect
= runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>();
m_qmlPort = aspect->qmlDebugServerPort();
Q_ASSERT(aspect->useCppDebugger() || aspect->useQmlDebugger());