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

Debugger: Store target pointer in DebuggerRunConfigurationAspect

Browse Source 
To avoid use of IRCAspect::runConfiguration().

Change-Id: Ic0518e368ec8caa4fdf7f9dc242123eedc893b4c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
hjk
2018-09-12 09:31:45 +02:00
parent 98cc38c925
commit be656dd9cc
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/debuggerrunconfigurationaspect.cpp
View File

@@ -211,7 +211,7 @@ void DebuggerRunConfigWidget::useMultiProcessToggled(bool on)
DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect( DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(
RunConfiguration *rc) : RunConfiguration *rc) :
IRunConfigurationAspect(rc) IRunConfigurationAspect(rc), m_target(rc->target())
{ {
setId("DebuggerAspect"); setId("DebuggerAspect");
setDisplayName(tr("Debugger settings")); setDisplayName(tr("Debugger settings"));
@@ -226,7 +226,7 @@ void DebuggerRunConfigurationAspect::setUseQmlDebugger(bool value)
bool DebuggerRunConfigurationAspect::useCppDebugger() const bool DebuggerRunConfigurationAspect::useCppDebugger() const
{ {
if (d.useCppDebugger == AutoEnabledLanguage) if (d.useCppDebugger == AutoEnabledLanguage)
return runConfiguration()->target()->project()->projectLanguages().contains( return m_target->project()->projectLanguages().contains(
ProjectExplorer::Constants::CXX_LANGUAGE_ID); ProjectExplorer::Constants::CXX_LANGUAGE_ID);
return d.useCppDebugger == EnabledLanguage; return d.useCppDebugger == EnabledLanguage;
} }
@@ -234,7 +234,7 @@ bool DebuggerRunConfigurationAspect::useCppDebugger() const
bool DebuggerRunConfigurationAspect::useQmlDebugger() const bool DebuggerRunConfigurationAspect::useQmlDebugger() const
{ {
if (d.useQmlDebugger == AutoEnabledLanguage) { if (d.useQmlDebugger == AutoEnabledLanguage) {
const Core::Context languages = runConfiguration()->target()->project()->projectLanguages(); const Core::Context languages = m_target->project()->projectLanguages();
if (!languages.contains(ProjectExplorer::Constants::QMLJS_LANGUAGE_ID)) if (!languages.contains(ProjectExplorer::Constants::QMLJS_LANGUAGE_ID))
return false; return false;
@@ -242,7 +242,7 @@ bool DebuggerRunConfigurationAspect::useQmlDebugger() const
// Try to find a build step (qmake) to check whether qml debugging is enabled there // Try to find a build step (qmake) to check whether qml debugging is enabled there
// (Using the Qt metatype system to avoid a hard qt4projectmanager dependency) // (Using the Qt metatype system to avoid a hard qt4projectmanager dependency)
// //
if (BuildConfiguration *bc = runConfiguration()->target()->activeBuildConfiguration()) { if (BuildConfiguration *bc = m_target->activeBuildConfiguration()) {
if (BuildStepList *bsl = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD)) { if (BuildStepList *bsl = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD)) {
foreach (BuildStep *step, bsl->steps()) { foreach (BuildStep *step, bsl->steps()) {
QVariant linkProperty = step->property("linkQmlDebuggingLibrary"); QVariant linkProperty = step->property("linkQmlDebuggingLibrary");
@@ -279,7 +279,7 @@ void DebuggerRunConfigurationAspect::setUseMultiProcess(bool value)
bool DebuggerRunConfigurationAspect::isQmlDebuggingSpinboxSuppressed() const bool DebuggerRunConfigurationAspect::isQmlDebuggingSpinboxSuppressed() const
{ {
Kit *k = runConfiguration()->target()->kit(); Kit *k = m_target->kit();
IDevice::ConstPtr dev = DeviceKitInformation::device(k); IDevice::ConstPtr dev = DeviceKitInformation::device(k);
if (dev.isNull()) if (dev.isNull())
return false; return false;

1
src/plugins/debugger/debuggerrunconfigurationaspect.h
View File

@@ -74,6 +74,7 @@ public:
private: private:
friend class Internal::DebuggerRunConfigWidget; friend class Internal::DebuggerRunConfigWidget;
DebuggerRunConfigurationAspectData d; DebuggerRunConfigurationAspectData d;
ProjectExplorer::Target *m_target;
}; };
} // namespace Debugger } // namespace Debugger