From 34fdf9082b64269f2e87a53461ca6ff2a3deb015 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Thu, 28 Feb 2013 13:06:15 +0100
Subject: [PATCH] QbsProjectManager: Adapt to qbs API change.
Use new type CleanOptions.
Change-Id: I2a096015b571bf3066135b642e497abcd5d1eb87
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
.../qbsprojectmanager/qbscleanstep.cpp | 51 +++++++++----------
src/plugins/qbsprojectmanager/qbscleanstep.h | 3 +-
src/plugins/qbsprojectmanager/qbsproject.cpp | 5 +-
src/plugins/qbsprojectmanager/qbsproject.h | 2 +-
4 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
index 4b33f65c3a8..2611537ce32 100644
--- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
@@ -44,7 +44,6 @@
static const char QBS_CLEAN_ALL[] = "Qbs.CleanAll";
static const char QBS_DRY_RUN[] = "Qbs.DryRun";
static const char QBS_KEEP_GOING[] = "Qbs.DryKeepGoing";
-static const char QBS_MAXJOBCOUNT[] = "Qbs.MaxJobs";
// --------------------------------------------------------------------
// Constants:
@@ -59,14 +58,14 @@ namespace Internal {
QbsCleanStep::QbsCleanStep(ProjectExplorer::BuildStepList *bsl) :
ProjectExplorer::BuildStep(bsl, Core::Id(Constants::QBS_CLEANSTEP_ID)),
- m_cleanAll(false), m_job(0), m_showCompilerOutput(true), m_parser(0)
+ m_job(0), m_showCompilerOutput(true), m_parser(0)
{
setDisplayName(tr("Qbs clean"));
}
QbsCleanStep::QbsCleanStep(ProjectExplorer::BuildStepList *bsl, const QbsCleanStep *other) :
ProjectExplorer::BuildStep(bsl, Core::Id(Constants::QBS_CLEANSTEP_ID)),
- m_qbsBuildOptions(other->m_qbsBuildOptions), m_cleanAll(other->m_cleanAll), m_job(0),
+ m_qbsCleanOptions(other->m_qbsCleanOptions), m_job(0),
m_showCompilerOutput(other->m_showCompilerOutput), m_parser(0)
{ }
@@ -97,9 +96,9 @@ void QbsCleanStep::run(QFutureInterface<bool> &fi)
m_fi = &fi;
QbsProject *pro = static_cast<QbsProject *>(project());
- qbs::BuildOptions options(m_qbsBuildOptions);
+ qbs::CleanOptions options(m_qbsCleanOptions);
- m_job = pro->clean(options, m_cleanAll);
+ m_job = pro->clean(options);
if (!m_job) {
m_fi->reportResult(false);
@@ -133,22 +132,22 @@ void QbsCleanStep::cancel()
bool QbsCleanStep::dryRun() const
{
- return m_qbsBuildOptions.dryRun;
+ return m_qbsCleanOptions.dryRun;
}
bool QbsCleanStep::keepGoing() const
{
- return m_qbsBuildOptions.keepGoing;
+ return m_qbsCleanOptions.keepGoing;
}
int QbsCleanStep::maxJobs() const
{
- return m_qbsBuildOptions.maxJobCount;
+ return 1;
}
bool QbsCleanStep::cleanAll() const
{
- return m_cleanAll;
+ return m_qbsCleanOptions.cleanType == qbs::CleanOptions::CleanupAll;
}
bool QbsCleanStep::fromMap(const QVariantMap &map)
@@ -156,10 +155,10 @@ bool QbsCleanStep::fromMap(const QVariantMap &map)
if (!ProjectExplorer::BuildStep::fromMap(map))
return false;
- m_qbsBuildOptions.dryRun = map.value(QLatin1String(QBS_DRY_RUN)).toBool();
- m_qbsBuildOptions.keepGoing = map.value(QLatin1String(QBS_KEEP_GOING)).toBool();
- m_qbsBuildOptions.maxJobCount = map.value(QLatin1String(QBS_MAXJOBCOUNT)).toInt();
- m_cleanAll = map.value(QLatin1String(QBS_CLEAN_ALL)).toBool();
+ m_qbsCleanOptions.dryRun = map.value(QLatin1String(QBS_DRY_RUN)).toBool();
+ m_qbsCleanOptions.keepGoing = map.value(QLatin1String(QBS_KEEP_GOING)).toBool();
+ m_qbsCleanOptions.cleanType = map.value(QLatin1String(QBS_CLEAN_ALL)).toBool()
+ ? qbs::CleanOptions::CleanupAll : qbs::CleanOptions::CleanupTemporaries;
return true;
}
@@ -167,10 +166,10 @@ bool QbsCleanStep::fromMap(const QVariantMap &map)
QVariantMap QbsCleanStep::toMap() const
{
QVariantMap map = ProjectExplorer::BuildStep::toMap();
- map.insert(QLatin1String(QBS_DRY_RUN), m_qbsBuildOptions.dryRun);
- map.insert(QLatin1String(QBS_KEEP_GOING), m_qbsBuildOptions.keepGoing);
- map.insert(QLatin1String(QBS_MAXJOBCOUNT), m_qbsBuildOptions.maxJobCount);
- map.insert(QLatin1String(QBS_CLEAN_ALL), m_cleanAll);
+ 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;
}
@@ -216,33 +215,33 @@ void QbsCleanStep::createTaskAndOutput(ProjectExplorer::Task::TaskType type, con
void QbsCleanStep::setDryRun(bool dr)
{
- if (m_qbsBuildOptions.dryRun == dr)
+ if (m_qbsCleanOptions.dryRun == dr)
return;
- m_qbsBuildOptions.dryRun = dr;
+ m_qbsCleanOptions.dryRun = dr;
emit changed();
}
void QbsCleanStep::setKeepGoing(bool kg)
{
- if (m_qbsBuildOptions.keepGoing == kg)
+ if (m_qbsCleanOptions.keepGoing == kg)
return;
- m_qbsBuildOptions.keepGoing = kg;
+ m_qbsCleanOptions.keepGoing = kg;
emit changed();
}
void QbsCleanStep::setMaxJobs(int jobcount)
{
- if (m_qbsBuildOptions.maxJobCount == jobcount)
- return;
- m_qbsBuildOptions.maxJobCount = jobcount;
+ Q_UNUSED(jobcount); // TODO: Remove all job count-related stuff.
emit changed();
}
void QbsCleanStep::setCleanAll(bool ca)
{
- if (m_cleanAll == ca)
+ qbs::CleanOptions::CleanType newType = ca
+ ? qbs::CleanOptions::CleanupAll : qbs::CleanOptions::CleanupTemporaries;
+ if (m_qbsCleanOptions.cleanType == newType)
return;
- m_cleanAll = ca;
+ m_qbsCleanOptions.cleanType = newType;
emit changed();
}
diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h
index 427e0692607..57c9b138b78 100644
--- a/src/plugins/qbsprojectmanager/qbscleanstep.h
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.h
@@ -84,8 +84,7 @@ private:
void setMaxJobs(int jobcount);
void setCleanAll(bool ca);
- qbs::BuildOptions m_qbsBuildOptions;
- bool m_cleanAll;
+ qbs::CleanOptions m_qbsCleanOptions;
QFutureInterface<bool> *m_fi;
qbs::CleanJob *m_job;
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index cc132e929df..2cc9d996274 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -177,12 +177,11 @@ qbs::BuildJob *QbsProject::build(const qbs::BuildOptions &opts)
return m_rootProjectNode->project()->buildAllProducts(opts, env);
}
-qbs::CleanJob *QbsProject::clean(const qbs::BuildOptions &opts, bool everything)
+qbs::CleanJob *QbsProject::clean(const qbs::CleanOptions &opts)
{
if (!m_rootProjectNode || !m_rootProjectNode->project())
return 0;
- return m_rootProjectNode->project()->cleanAllProducts(opts, everything ? qbs::Project::CleanupAll
- : qbs::Project::CleanupTemporaries);
+ return m_rootProjectNode->project()->cleanAllProducts(opts);
}
QString QbsProject::profileForTarget(const ProjectExplorer::Target *t) const
diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h
index 1c98a04ab3c..81b2e116a6b 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.h
+++ b/src/plugins/qbsprojectmanager/qbsproject.h
@@ -80,7 +80,7 @@ public:
QStringList files(FilesMode fileMode) const;
qbs::BuildJob *build(const qbs::BuildOptions &opts);
- qbs::CleanJob *clean(const qbs::BuildOptions &opts, bool everything);
+ qbs::CleanJob *clean(const qbs::CleanOptions &opts);
static ProjectExplorer::FileType fileTypeFor(const QSet<QString> &tags);
--
GitLab