Revert "Update jobs to remove post FF changes"

d521b994450f0a4febbd789ba66701ba24fdbe22

Change-Id: Ibe6d608e8400e69b50775c0eb156e74e4e90b25c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

4 files changed, 7 insertions, 2 deletions

diff --git a/src/animation/backend/abstractevaluateclipanimatorjob.cpp b/src/animation/backend/abstractevaluateclipanimatorjob.cpp
index e3c8e9e40..5267d4526 100644
--- a/src/animation/backend/abstractevaluateclipanimatorjob.cpp
+++ b/src/animation/backend/abstractevaluateclipanimatorjob.cpp
@@ -75,7 +75,7 @@ void AbstractEvaluateClipAnimatorJob::setPostFrameData(const AnimationRecord &re
                     }), mainThreadCB.end());
     // Should now only have callbacks to be called on main thread
 
-    Q_DJOB(AbstractEvaluateClipAnimatorJob);
+    Q_D(AbstractEvaluateClipAnimatorJob);
     d->m_record = record;
     d->m_callbacks = mainThreadCB;
 }
diff --git a/src/animation/backend/abstractevaluateclipanimatorjob_p.h b/src/animation/backend/abstractevaluateclipanimatorjob_p.h
index 7027a8639..2a8914faa 100644
--- a/src/animation/backend/abstractevaluateclipanimatorjob_p.h
+++ b/src/animation/backend/abstractevaluateclipanimatorjob_p.h
@@ -64,6 +64,9 @@ protected:
     AbstractEvaluateClipAnimatorJob();
 
     void setPostFrameData(const AnimationRecord &record, const QVector<AnimationCallbackAndValue> &callbacks);
+
+private:
+    Q_DECLARE_PRIVATE(AbstractEvaluateClipAnimatorJob)
 };
 
 } // Animation
diff --git a/src/animation/backend/loadanimationclipjob.cpp b/src/animation/backend/loadanimationclipjob.cpp
index 86d7edf87..93d4c2d9d 100644
--- a/src/animation/backend/loadanimationclipjob.cpp
+++ b/src/animation/backend/loadanimationclipjob.cpp
@@ -85,7 +85,7 @@ void LoadAnimationClipJob::clearDirtyAnimationClips()
 void LoadAnimationClipJob::run()
 {
     Q_ASSERT(m_handler);
-    Q_DJOB(LoadAnimationClipJob);
+    Q_D(LoadAnimationClipJob);
 
     d->m_updatedNodes.reserve(m_animationClipHandles.size());
     AnimationClipLoaderManager *animationClipManager = m_handler->animationClipLoaderManager();
diff --git a/src/animation/backend/loadanimationclipjob_p.h b/src/animation/backend/loadanimationclipjob_p.h
index 42cf27854..07d78d416 100644
--- a/src/animation/backend/loadanimationclipjob_p.h
+++ b/src/animation/backend/loadanimationclipjob_p.h
@@ -76,6 +76,8 @@ protected:
     void run() override;
 
 private:
+    Q_DECLARE_PRIVATE(LoadAnimationClipJob)
+
     QVector<HAnimationClip> m_animationClipHandles;
     Handler *m_handler;
 };