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

Debugger: Avoid two uses of IRCAspect::runConfiguration

Browse Source 
The function is about to be removed.

Change-Id: Ib18d1c51c18a9a979395910cdcd487575061dea0
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2018-09-11 14:40:57 +02:00
parent 679576b511
commit 8b24fb2a46
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/autotest/testrunconfiguration.h
View File

@@ -29,10 +29,13 @@
#include "testconfiguration.h" #include "testconfiguration.h"
#include <debugger/debuggerrunconfigurationaspect.h> #include <debugger/debuggerrunconfigurationaspect.h>
#include <projectexplorer/applicationlauncher.h> #include <projectexplorer/applicationlauncher.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/devicesupport/devicemanager.h> #include <projectexplorer/devicesupport/devicemanager.h>
#include <projectexplorer/runconfiguration.h> #include <projectexplorer/runconfiguration.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QCoreApplication> #include <QCoreApplication>
@@ -54,8 +57,10 @@ public:
if (auto debuggable = dynamic_cast<DebuggableTestConfiguration *>(config)) if (auto debuggable = dynamic_cast<DebuggableTestConfiguration *>(config))
enableQuick = debuggable->mixedDebugging(); enableQuick = debuggable->mixedDebugging();
if (auto debugAspect = extraAspect<Debugger::DebuggerRunConfigurationAspect>()) if (auto debugAspect = extraAspect<Debugger::DebuggerRunConfigurationAspect>()) {
debugAspect->setUseQmlDebugger(enableQuick); debugAspect->setUseQmlDebugger(enableQuick);
ProjectExplorer::ProjectExplorerPlugin::instance()->updateRunActions();
}
m_testConfig = config; m_testConfig = config;
} }

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

@@ -221,13 +221,6 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(
void DebuggerRunConfigurationAspect::setUseQmlDebugger(bool value) void DebuggerRunConfigurationAspect::setUseQmlDebugger(bool value)
{ {
d.useQmlDebugger = value ? EnabledLanguage : DisabledLanguage; d.useQmlDebugger = value ? EnabledLanguage : DisabledLanguage;
runConfiguration()->requestRunActionsUpdate();
}
void DebuggerRunConfigurationAspect::setUseCppDebugger(bool value)
{
d.useCppDebugger = value ? EnabledLanguage : DisabledLanguage;
runConfiguration()->requestRunActionsUpdate();
} }
bool DebuggerRunConfigurationAspect::useCppDebugger() const bool DebuggerRunConfigurationAspect::useCppDebugger() const

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

@@ -61,7 +61,6 @@ public:
void toMap(QVariantMap &map) const override; void toMap(QVariantMap &map) const override;
bool useCppDebugger() const; bool useCppDebugger() const;
void setUseCppDebugger(bool value);
bool useQmlDebugger() const; bool useQmlDebugger() const;
void setUseQmlDebugger(bool value); void setUseQmlDebugger(bool value);
uint qmlDebugServerPort() const; uint qmlDebugServerPort() const;