From 74b0ee3f3c3113f43f6fa8df85d9302672826a85 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 1 Dec 2009 15:10:13 +0100 Subject: [PATCH 1/2] Move "make active" label to proper location. * It was missing its margin. Reviewed-by: Roberto Raggi --- src/plugins/projectexplorer/buildsettingspropertiespage.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp index e8cc4c35537..ee392d11976 100644 --- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp @@ -146,6 +146,7 @@ void BuildSettingsWidget::init() } m_makeActiveLabel = new QLabel(this); + m_makeActiveLabel->setContentsMargins(m_leftMargin, 4, 0, 4); m_makeActiveLabel->setVisible(false); vbox->addWidget(m_makeActiveLabel); From b583c3d4ed13fce2e8ccd8984179b08749124756 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 1 Dec 2009 15:11:40 +0100 Subject: [PATCH 2/2] Fix connect that got broken during rebase. * Fix two connects I broke earlier while doing a rebase. Reviewed-by: Roberto Raggi --- src/plugins/projectexplorer/projectwindow.cpp | 8 ++++---- src/plugins/projectexplorer/projectwindow.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index b7be977809a..5bec7a3da53 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -531,10 +531,10 @@ BuildConfigurationComboBox::BuildConfigurationComboBox(Project *p, QWidget *pare // this, SLOT(nameChanged(ProjectExplorer::BuildConfiguration *))); connect(p, SIGNAL(activeBuildConfigurationChanged()), this, SLOT(activeConfigurationChanged())); - connect(p, SIGNAL(addedBuildConfiguration(ProjectExplorer::Project *, ProjectExplorer::BuildConfiguration *)), - this, SLOT(addedBuildConfiguration(ProjectExplorer::Project *, ProjectExplorer::BuildConfiguration *))); - connect(p, SIGNAL(removedBuildConfiguration(ProjectExplorer::Project *, ProjectExplorer::BuildConfiguration *)), - this, SLOT(removedBuildConfiguration(ProjectExplorer::Project *, ProjectExplorer::BuildConfiguration *))); + connect(p, SIGNAL(addedBuildConfiguration(ProjectExplorer::Project*,ProjectExplorer::BuildConfiguration*)), + this, SLOT(addedBuildConfiguration(ProjectExplorer::Project*,ProjectExplorer::BuildConfiguration*))); + connect(p, SIGNAL(removedBuildConfiguration(ProjectExplorer::Project*,ProjectExplorer::BuildConfiguration*)), + this, SLOT(removedBuildConfiguration(ProjectExplorer::Project*,ProjectExplorer::BuildConfiguration*))); connect(m_comboBox, SIGNAL(activated(int)), this, SLOT(changedIndex(int))); } diff --git a/src/plugins/projectexplorer/projectwindow.h b/src/plugins/projectexplorer/projectwindow.h index 558dbc7bb15..aec941d7664 100644 --- a/src/plugins/projectexplorer/projectwindow.h +++ b/src/plugins/projectexplorer/projectwindow.h @@ -98,9 +98,9 @@ private slots: void nameChanged(BuildConfiguration *bc); void activeConfigurationChanged(); void addedBuildConfiguration(ProjectExplorer::Project *project, - BuildConfiguration *bc); + ProjectExplorer::BuildConfiguration *bc); void removedBuildConfiguration(ProjectExplorer::Project *project, - BuildConfiguration *bc); + ProjectExplorer::BuildConfiguration *bc); void changedIndex(int newIndex); private: int buildConfigurationToIndex(BuildConfiguration *bc);