Update qbs submodule.

To HEAD of 1.5 branch. Also do the necessary
adaptations in the QbsProjectManager plugin.

Change-Id: Ic4c756b7f6134b9c61bad9635ac25c1e33c75825
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp

@@ -257,10 +257,6 @@ public:
         return m_qbsBuildStep ? m_qbsBuildStep->maxJobs() : 0;
     }
 
-    bool allArtifacts() const {
-        return m_qbsCleanStep ? m_qbsCleanStep->cleanAll() : false;
-    }
-
     QString installRoot() const {
         return m_qbsInstallStep ? m_qbsInstallStep->absoluteInstallRoot() : QString();
     }
@@ -308,8 +304,6 @@ QString QbsBuildConfiguration::equivalentCommandLine(const BuildStep *buildStep)
         Utils::QtcProcess::addArgs(&commandLine, QStringList() << QLatin1String("--jobs")
                                    << QString::number(jobCount));
     }
-    if (stepProxy.allArtifacts())
-        Utils::QtcProcess::addArg(&commandLine, QLatin1String("--all-artifacts"));
     const QString installRoot = stepProxy.installRoot();
     if (!installRoot.isEmpty()) {
         Utils::QtcProcess::addArgs(&commandLine, QStringList() << QLatin1String("--install-root")

src/plugins/qbsprojectmanager/qbscleanstep.cpp

@@ -38,7 +38,6 @@
 #include <projectexplorer/target.h>
 #include <utils/qtcassert.h>
 
-static const char QBS_CLEAN_ALL[] = "Qbs.CleanAll";
 static const char QBS_DRY_RUN[] = "Qbs.DryRun";
 static const char QBS_KEEP_GOING[] = "Qbs.DryKeepGoing";
 
@@ -146,10 +145,6 @@ int QbsCleanStep::maxJobs() const
     return 1;
 }
 
-bool QbsCleanStep::cleanAll() const
-{
-    return m_qbsCleanOptions.cleanType() == qbs::CleanOptions::CleanupAll;
-}
 
 bool QbsCleanStep::fromMap(const QVariantMap &map)
 {
@@ -158,8 +153,6 @@ bool QbsCleanStep::fromMap(const QVariantMap &map)
 
     m_qbsCleanOptions.setDryRun(map.value(QLatin1String(QBS_DRY_RUN)).toBool());
     m_qbsCleanOptions.setKeepGoing(map.value(QLatin1String(QBS_KEEP_GOING)).toBool());
-    m_qbsCleanOptions.setCleanType(map.value(QLatin1String(QBS_CLEAN_ALL)).toBool()
-            ? qbs::CleanOptions::CleanupAll : qbs::CleanOptions::CleanupTemporaries);
 
     return true;
 }
@@ -169,8 +162,6 @@ QVariantMap QbsCleanStep::toMap() const
     QVariantMap map = ProjectExplorer::BuildStep::toMap();
     map.insert(QLatin1String(QBS_DRY_RUN), m_qbsCleanOptions.dryRun());
     map.insert(QLatin1String(QBS_KEEP_GOING), m_qbsCleanOptions.keepGoing());
-    map.insert(QLatin1String(QBS_CLEAN_ALL),
-               m_qbsCleanOptions.cleanType() == qbs::CleanOptions::CleanupAll);
 
     return map;
 }
@@ -237,15 +228,6 @@ void QbsCleanStep::setMaxJobs(int jobcount)
     emit changed();
 }
 
-void QbsCleanStep::setCleanAll(bool ca)
-{
-    qbs::CleanOptions::CleanType newType = ca
-            ? qbs::CleanOptions::CleanupAll : qbs::CleanOptions::CleanupTemporaries;
-    if (m_qbsCleanOptions.cleanType() == newType)
-        return;
-    m_qbsCleanOptions.setCleanType(newType);
-    emit changed();
-}
 
 // --------------------------------------------------------------------
 // QbsCleanStepConfigWidget:
@@ -262,8 +244,6 @@ QbsCleanStepConfigWidget::QbsCleanStepConfigWidget(QbsCleanStep *step) :
     m_ui = new Ui::QbsCleanStepConfigWidget;
     m_ui->setupUi(this);
 
-    connect(m_ui->cleanAllCheckBox, SIGNAL(toggled(bool)),
-            this, SLOT(changeCleanAll(bool)));
     connect(m_ui->dryRunCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeDryRun(bool)));
     connect(m_ui->keepGoingCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeKeepGoing(bool)));
 
@@ -287,7 +267,6 @@ QString QbsCleanStepConfigWidget::displayName() const
 
 void QbsCleanStepConfigWidget::updateState()
 {
-    m_ui->cleanAllCheckBox->setChecked(m_step->cleanAll());
     m_ui->dryRunCheckBox->setChecked(m_step->dryRun());
     m_ui->keepGoingCheckBox->setChecked(m_step->keepGoing());
 
@@ -301,11 +280,6 @@ void QbsCleanStepConfigWidget::updateState()
     }
 }
 
-void QbsCleanStepConfigWidget::changeCleanAll(bool ca)
-{
-    m_step->setCleanAll(ca);
-}
-
 void QbsCleanStepConfigWidget::changeDryRun(bool dr)
 {
     m_step->setDryRun(dr);

src/plugins/qbsprojectmanager/qbscleanstep.h

@@ -62,7 +62,6 @@ public:
     bool dryRun() const;
     bool keepGoing() const;
     int maxJobs() const;
-    bool cleanAll() const;
 
 signals:
     void changed();
@@ -79,7 +78,6 @@ private:
     void setDryRun(bool dr);
     void setKeepGoing(bool kg);
     void setMaxJobs(int jobcount);
-    void setCleanAll(bool ca);
 
     qbs::CleanOptions m_qbsCleanOptions;
 
@@ -106,7 +104,6 @@ public:
 private slots:
     void updateState();
 
-    void changeCleanAll(bool ca);
     void changeDryRun(bool dr);
     void changeKeepGoing(bool kg);
     void changeJobCount(int jobcount);

src/plugins/qbsprojectmanager/qbscleanstepconfigwidget.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>585</width>
+    <width>597</width>
     <height>140</height>
    </rect>
   </property>
@@ -20,13 +20,6 @@
    </item>
    <item row="0" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QCheckBox" name="cleanAllCheckBox">
-       <property name="text">
-        <string>Clean all artifacts</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QCheckBox" name="dryRunCheckBox">
        <property name="text">

src/plugins/qbsprojectmanager/qbsprojectparser.cpp

@@ -81,7 +81,7 @@ void QbsProjectParser::parse(const QVariantMap &config, const Environment &env,
     params.setTopLevelProfile(profileName);
     specialKey = QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY);
     params.setBuildVariant(userConfig.take(specialKey).toString());
-    params.setSettingsDirectory(QbsManager::settings()->baseDirectoy());
+    params.setSettingsDirectory(QbsManager::settings()->baseDirectory());
     params.setOverriddenValues(userConfig);
 
     // Some people don't like it when files are created as a side effect of opening a project,