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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Change-Id: I9006dd493707ae626ae3502541599c8789e1aab0
This commit is contained in:
Eike Ziller
2017-02-27 15:17:30 +01:00
parent 0995cf22ab 126a031ee2
commit 1704c484a8
28 changed files with 218 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -967,7 +967,6 @@ public:
void updateUiForProject(ProjectExplorer::Project *project);
void updateUiForTarget(ProjectExplorer::Target *target);
void updateUiForRunConfiguration(ProjectExplorer::RunConfiguration *rc);
void updateActiveLanguages();
public:
@@ -3324,12 +3323,11 @@ void DebuggerPluginPrivate::updateUiForProject(Project *project)
}
m_previousProject = project;
if (!project) {
updateUiForTarget(0);
updateUiForTarget(nullptr);
return;
}
connect(project, &Project::activeTargetChanged,
this, &DebuggerPluginPrivate::updateUiForTarget,
Qt::QueuedConnection);
this, &DebuggerPluginPrivate::updateUiForTarget);
updateUiForTarget(project->activeTarget());
}
@@ -3337,35 +3335,19 @@ void DebuggerPluginPrivate::updateUiForTarget(Target *target)
{
if (m_previousTarget) {
disconnect(m_previousTarget.data(), &Target::activeRunConfigurationChanged,
this, &DebuggerPluginPrivate::updateUiForRunConfiguration);
this, &DebuggerPluginPrivate::updateActiveLanguages);
}
m_previousTarget = target;
if (!target) {
updateUiForRunConfiguration(0);
updateActiveLanguages();
return;
}
connect(target, &Target::activeRunConfigurationChanged,
this, &DebuggerPluginPrivate::updateUiForRunConfiguration,
Qt::QueuedConnection);
updateUiForRunConfiguration(target->activeRunConfiguration());
}
// updates default debug language settings per run config.
void DebuggerPluginPrivate::updateUiForRunConfiguration(RunConfiguration *rc)
{
// if (m_previousRunConfiguration)
// disconnect(m_previousRunConfiguration, &RunConfiguration::requestRunActionsUpdate,
// this, &DebuggerPluginPrivate::updateActiveLanguages);
// m_previousRunConfiguration = rc;
Q_UNUSED(rc); // FIXME
this, &DebuggerPluginPrivate::updateActiveLanguages);
updateActiveLanguages();
// if (m_previousRunConfiguration)
// connect(m_previousRunConfiguration, &RunConfiguration::requestRunActionsUpdate,
// this, &DebuggerPluginPrivate::updateActiveLanguages,
// Qt::QueuedConnection);
}
void DebuggerPluginPrivate::updateActiveLanguages()