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

GenericProjectManager: Remove todos

Browse Source 
Actually update the "Override make" label on toolchain changes
The makestep configuration widget being a friend of the step is not that
bad.

Change-Id: I5e88905cb0da99a4c1c28d8c56e669141e80ce17
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Daniel Teske
2012-05-03 16:07:58 +02:00
parent ce62c4bf91
commit 5a041c513d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/genericprojectmanager/genericmakestep.cpp
View File

@@ -225,7 +225,6 @@ GenericMakeStepConfigWidget::GenericMakeStepConfigWidget(GenericMakeStep *makeSt
m_ui = new Ui::GenericMakeStep; m_ui = new Ui::GenericMakeStep;
m_ui->setupUi(this); m_ui->setupUi(this);
// TODO update this list also on rescans of the GenericLists.txt
GenericProject *pro = static_cast<GenericProject *>(m_makeStep->target()->project()); GenericProject *pro = static_cast<GenericProject *>(m_makeStep->target()->project());
foreach (const QString &target, pro->buildTargets()) { foreach (const QString &target, pro->buildTargets()) {
QListWidgetItem *item = new QListWidgetItem(target, m_ui->targetsList); QListWidgetItem *item = new QListWidgetItem(target, m_ui->targetsList);
@@ -249,6 +248,9 @@ GenericMakeStepConfigWidget::GenericMakeStepConfigWidget(GenericMakeStep *makeSt
this, SLOT(updateMakeOverrrideLabel())); this, SLOT(updateMakeOverrrideLabel()));
connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()), connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
this, SLOT(updateDetails())); this, SLOT(updateDetails()));
connect(pro, SIGNAL(toolChainChanged(ProjectExplorer::ToolChain*)),
this, SLOT(updateMakeOverrrideLabel()));
} }
QString GenericMakeStepConfigWidget::displayName() const QString GenericMakeStepConfigWidget::displayName() const
@@ -256,7 +258,6 @@ QString GenericMakeStepConfigWidget::displayName() const
return tr("Make", "GenericMakestep display name."); return tr("Make", "GenericMakestep display name.");
} }
// TODO: Label should update when tool chain is changed
void GenericMakeStepConfigWidget::updateMakeOverrrideLabel() void GenericMakeStepConfigWidget::updateMakeOverrrideLabel()
{ {
m_ui->makeLabel->setText(tr("Override %1:").arg(m_makeStep->makeCommand())); m_ui->makeLabel->setText(tr("Override %1:").arg(m_makeStep->makeCommand()));

2
src/plugins/genericprojectmanager/genericmakestep.h
View File

@@ -51,7 +51,7 @@ class GenericMakeStep : public ProjectExplorer::AbstractProcessStep
{ {
Q_OBJECT Q_OBJECT
friend class GenericMakeStepConfigWidget; // TODO remove again? friend class GenericMakeStepConfigWidget;
friend class GenericMakeStepFactory; friend class GenericMakeStepFactory;
public: public: