Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline

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);
 

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)));
 }

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);