Merge remote-tracking branch 'origin/4.3'

Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp
	src/plugins/genericprojectmanager/genericproject.h
	src/plugins/projectexplorer/projectmodels.cpp

Change-Id: I290cba328212cadd3c12909d1f2f3642d326a1ca

src/plugins/ios/ios.qbs

@@ -17,6 +17,11 @@ QtcPlugin {
         "ios.qrc",
         "iosanalyzesupport.cpp",
         "iosanalyzesupport.h",
+        "iosbuildconfiguration.cpp",
+        "iosbuildconfiguration.h",
+        "iosbuildsettingswidget.cpp",
+        "iosbuildsettingswidget.h",
+        "iosbuildsettingswidget.ui",
         "iosbuildstep.cpp",
         "iosbuildstep.h",
         "iosbuildstep.ui",

src/plugins/ios/iosbuildsettingswidget.h

@@ -49,17 +49,15 @@ public:
                                     bool isSigningAutoManaged, QWidget *parent = 0);
     ~IosBuildSettingsWidget();
 
-public:
     bool isSigningAutomaticallyManaged() const;
 
-private slots:
-    void onSigningEntityComboIndexChanged();
-    void onReset();
-
 signals:
     void signingSettingsChanged(bool isAutoManaged, QString identifier);
 
 private:
+    void onSigningEntityComboIndexChanged();
+    void onReset();
+
     void setDefaultSigningIdentfier(const QString &identifier) const;
     void configureSigningUi(bool autoManageSigning);
     void populateDevelopmentTeams();