Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Id669d5c1aab29965eac0dabd1cb497e908dac23e

4 files changed, 9 insertions, 7 deletions

diff --git a/src/core/jobs/qaspectjob.cpp b/src/core/jobs/qaspectjob.cpp
index 557756581..7c23f6894 100644
--- a/src/core/jobs/qaspectjob.cpp
+++ b/src/core/jobs/qaspectjob.cpp
@@ -70,7 +70,7 @@ QAspectJobPrivate *QAspectJobPrivate::get(QAspectJob *job)
     return job->d_func();
 }
 
-bool QAspectJobPrivate::isRequired()
+bool QAspectJobPrivate::isRequired() const
 {
     return true;
 }
diff --git a/src/core/jobs/qaspectjob_p.h b/src/core/jobs/qaspectjob_p.h
index 63a2cc572..0c7802b02 100644
--- a/src/core/jobs/qaspectjob_p.h
+++ b/src/core/jobs/qaspectjob_p.h
@@ -72,9 +72,11 @@ public:
 
     static QAspectJobPrivate *get(QAspectJob *job);
 
-    virtual bool isRequired();
+    virtual bool isRequired() const;
     virtual void postFrame(QAspectManager *aspectManager);
 
+    void clearDependencies() { m_dependencies.clear(); }
+
     QVector<QWeakPointer<QAspectJob> > m_dependencies;
     JobId m_jobId;
     QString m_jobName;
diff --git a/src/core/jobs/task.cpp b/src/core/jobs/task.cpp
index f5bfae014..47de41989 100644
--- a/src/core/jobs/task.cpp
+++ b/src/core/jobs/task.cpp
@@ -68,7 +68,7 @@ AspectTaskRunnable::~AspectTaskRunnable()
 {
 }
 
-bool AspectTaskRunnable::isRequired()
+bool AspectTaskRunnable::isRequired() const
 {
     return m_job ? QAspectJobPrivate::get(m_job.data())->isRequired() : false;
 }
@@ -105,7 +105,7 @@ SyncTaskRunnable::~SyncTaskRunnable()
 {
 }
 
-bool SyncTaskRunnable::isRequired()
+bool SyncTaskRunnable::isRequired() const
 {
     return true;
 }
diff --git a/src/core/jobs/task_p.h b/src/core/jobs/task_p.h
index 90d0674b4..73c34534d 100644
--- a/src/core/jobs/task_p.h
+++ b/src/core/jobs/task_p.h
@@ -77,7 +77,7 @@ public:
 
     virtual ~RunnableInterface();
 
-    virtual bool isRequired() = 0;
+    virtual bool isRequired() const = 0;
     virtual void run() = 0;
 
     virtual int id() = 0;
@@ -97,7 +97,7 @@ public:
     AspectTaskRunnable(QSystemInformationService *service);
     ~AspectTaskRunnable();
 
-    bool isRequired() override;
+    bool isRequired() const override;
     void run() override;
 
     void setPooler(QThreadPooler *pooler) override { m_pooler = pooler; }
@@ -129,7 +129,7 @@ public:
                               QAtomicInt *atomicCount);
     ~SyncTaskRunnable();
 
-    bool isRequired() override;
+    bool isRequired() const override;
     void run() override;
 
     void setPooler(QThreadPooler *pooler) override { m_pooler = pooler; }