diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/animation/backend/backend.pri | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/animation/backend/backend.pri')
| -rw-r--r-- | src/animation/backend/backend.pri | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/animation/backend/backend.pri b/src/animation/backend/backend.pri index b0b0feaf0..2bc72e1d3 100644 --- a/src/animation/backend/backend.pri +++ b/src/animation/backend/backend.pri @@ -2,7 +2,6 @@ INCLUDEPATH += $$PWD HEADERS += \ - $$PWD/animationclip_p.h \ $$PWD/handle_types_p.h \ $$PWD/handler_p.h \ $$PWD/nodefunctor_p.h \ @@ -13,7 +12,6 @@ HEADERS += \ $$PWD/functionrangefinder_p.h \ $$PWD/clipanimator_p.h \ $$PWD/blendedclipanimator_p.h \ - $$PWD/conductedclipanimator_p.h \ $$PWD/backendnode_p.h \ $$PWD/loadanimationclipjob_p.h \ $$PWD/channelmapping_p.h \ @@ -21,21 +19,22 @@ HEADERS += \ $$PWD/findrunningclipanimatorsjob_p.h \ $$PWD/evaluateclipanimatorjob_p.h \ $$PWD/clipblendnode_p.h \ - $$PWD/lerpblend_p.h \ $$PWD/clipblendnodevisitor_p.h \ $$PWD/animationutils_p.h \ $$PWD/buildblendtreesjob_p.h \ - $$PWD/evaluateblendclipanimatorjob_p.h + $$PWD/evaluateblendclipanimatorjob_p.h \ + $$PWD/lerpclipblend_p.h \ + $$PWD/additiveclipblend_p.h \ + $$PWD/clipblendvalue_p.h \ + $$PWD/animationclip_p.h SOURCES += \ - $$PWD/animationclip.cpp \ $$PWD/handler.cpp \ $$PWD/fcurve.cpp \ $$PWD/bezierevaluator.cpp \ $$PWD/functionrangefinder.cpp \ $$PWD/clipanimator.cpp \ $$PWD/blendedclipanimator.cpp \ - $$PWD/conductedclipanimator.cpp \ $$PWD/backendnode.cpp \ $$PWD/loadanimationclipjob.cpp \ $$PWD/channelmapping.cpp \ @@ -43,9 +42,12 @@ SOURCES += \ $$PWD/findrunningclipanimatorsjob.cpp \ $$PWD/evaluateclipanimatorjob.cpp \ $$PWD/clipblendnode.cpp \ - $$PWD/lerpblend.cpp \ $$PWD/managers.cpp \ $$PWD/clipblendnodevisitor.cpp \ $$PWD/animationutils.cpp \ $$PWD/buildblendtreesjob.cpp \ - $$PWD/evaluateblendclipanimatorjob.cpp + $$PWD/evaluateblendclipanimatorjob.cpp \ + $$PWD/lerpclipblend.cpp \ + $$PWD/additiveclipblend.cpp \ + $$PWD/clipblendvalue.cpp \ + $$PWD/animationclip.cpp |