Merge branch '5.15' into dev

Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7

1 files changed, 3 insertions, 1 deletions

diff --git a/src/core/jobs/task_p.h b/src/core/jobs/task_p.h
index c81882719..ff411539f 100644
--- a/src/core/jobs/task_p.h
+++ b/src/core/jobs/task_p.h
@@ -65,6 +65,7 @@ namespace Qt3DCore {
 class JobRunner;
 class DependencyHandler;
 class QThreadPooler;
+class QSystemInformationService;
 
 class RunnableInterface : public QRunnable
 {
@@ -92,7 +93,7 @@ public:
 class AspectTaskRunnable : public RunnableInterface
 {
 public:
-    AspectTaskRunnable();
+    AspectTaskRunnable(QSystemInformationService *service);
     ~AspectTaskRunnable();
 
     void run() override;
@@ -113,6 +114,7 @@ public:
     int m_dependerCount = 0;
 
 private:
+    QSystemInformationService *m_service;
     QThreadPooler *m_pooler;
     int m_id; // For testing purposes for now
     bool m_reserved;