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

Merge remote-tracking branch 'origin/4.11' into 4.12

Browse Source 
Conflicts:
	src/plugins/autotest/testrunconfiguration.h

Change-Id: I1bc156ef4acbf9109d809e4f8fe1c9e73444040f
This commit is contained in:
Eike Ziller
2020-03-16 07:19:52 +01:00
parent d44b181923 effb6133fd
commit 3faa91945a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,10 +57,9 @@ public:
if (auto debuggable = dynamic_cast<DebuggableTestConfiguration *>(config))
enableQuick = debuggable->mixedDebugging();
if (auto debugAspect = aspect<Debugger::DebuggerRunConfigurationAspect>()) {
debugAspect->setUseQmlDebugger(enableQuick);
ProjectExplorer::ProjectExplorerPlugin::updateRunActions();
}
auto debugAspect = addAspect<Debugger::DebuggerRunConfigurationAspect>(parent);
debugAspect->setUseQmlDebugger(enableQuick);
ProjectExplorer::ProjectExplorerPlugin::updateRunActions();
m_testConfig = config;
}