diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2018-04-23 18:02:15 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2018-04-27 14:07:23 +0000 |
| commit | b2cd5db1e5bfcd168bce025b126d4c5a2fc9e0ae (patch) | |
| tree | 5c7c4af9e7c536d1172271b6b2f7849668778c27 /src/imports/timeline/qtquicktimelineplugin.cpp | |
| parent | e60155d6af1a9e1c86bfb7679dbd92ce616ad8fd (diff) | |
Add TimelineAnimation
* New api to define animation clips
* Special animation type for timeline
* Adding ping pong for TimelineAnimation
* Adjusting manual tests
* Adding new manual tests
Change-Id: Ic670b389062ef4ac92e000bc99574e5fa04a7006
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/imports/timeline/qtquicktimelineplugin.cpp')
| -rw-r--r-- | src/imports/timeline/qtquicktimelineplugin.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/timeline/qtquicktimelineplugin.cpp b/src/imports/timeline/qtquicktimelineplugin.cpp index b1cb0dc..35f47bd 100644 --- a/src/imports/timeline/qtquicktimelineplugin.cpp +++ b/src/imports/timeline/qtquicktimelineplugin.cpp @@ -18,8 +18,9 @@ #include <QtQml/qqmlextensionplugin.h> -#include "qquicktimeline_p.h" #include "qquickkeyframe_p.h" +#include "qquicktimeline_p.h" +#include "qquicktimelineanimation_p.h" static inline void initResources() { @@ -50,6 +51,7 @@ QtQuickTimelinePlugin::QtQuickTimelinePlugin(QObject *parent) : QQmlExtensionPlu void QtQuickTimelinePlugin::registerTypes(const char *uri) { qmlRegisterType<QQuickTimeline>(uri, 1, 0, "Timeline"); + qmlRegisterType<QQuickTimelineAnimation>(uri, 1, 0, "TimelineAnimation"); qmlRegisterType<QQuickKeyframe>(uri, 1, 0, "Keyframe"); qmlRegisterType<QQuickKeyframeGroup>(uri, 1, 0, "KeyframeGroup"); } |