Merge remote-tracking branch 'origin/4.5'

Change-Id: I60fca091b2eac67259580acba5ae934c16d74a83

src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

@@ -144,21 +144,7 @@ void QbsRunConfiguration::initialize(Core::Id id)
 {
     RunConfiguration::initialize(id);
     m_uniqueProductName = uniqueProductNameFromId(id);
-    ctor();
-}
 
-void QbsRunConfiguration::copyFrom(const QbsRunConfiguration *source)
-{
-    RunConfiguration::copyFrom(source);
-    m_uniqueProductName = source->m_uniqueProductName;
-    m_currentInstallStep = nullptr; // no need to copy this, we will get if from the DC anyway.
-    m_currentBuildStepList = nullptr;  // ditto
-
-    ctor();
-}
-
-void QbsRunConfiguration::ctor()
-{
     setDefaultDisplayName(defaultDisplayName());
     installStepChanged();
 }

src/plugins/qbsprojectmanager/qbsrunconfiguration.h

@@ -71,15 +71,12 @@ signals:
 
 private:
     void initialize(Core::Id id);
-    void copyFrom(const QbsRunConfiguration *source);
 
     void installStepChanged();
     void installStepToBeRemoved(int pos);
     QString baseWorkingDirectory() const;
     QString defaultDisplayName();
 
-    void ctor();
-
     void updateTarget();
 
     QString m_uniqueProductName;