diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-09-18 20:16:16 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-21 22:23:13 +0200 |
commit | a0f8be4021caa9bb5055923f0eea3bee0e345235 (patch) | |
tree | cf33dd92e8284f5692e65b1a574749d50da4a3f0 /src/quick/util/qquickutilmodule.cpp | |
parent | 0fc040ef70513ccaeb9e96f7ca05a3df4d6c7879 (diff) |
Animators - Render thread animation system
This introduces 6 new QML types for animating state in the
scene graph when the UI thread is blocked. The QObject property
being animated is updated after the animation completes.
It works also with the "windows" and "basic" render loops, but
offer litte benefit then compared to in the "threaded" case.
Change-Id: Ic19e47c898c0b8bd53e457db922b3c9c457c8147
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/quick/util/qquickutilmodule.cpp')
-rw-r--r-- | src/quick/util/qquickutilmodule.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/quick/util/qquickutilmodule.cpp b/src/quick/util/qquickutilmodule.cpp index fdf8314145..ccde83ca6e 100644 --- a/src/quick/util/qquickutilmodule.cpp +++ b/src/quick/util/qquickutilmodule.cpp @@ -53,6 +53,7 @@ #include "qquickstate_p_p.h" #include "qquicksystempalette_p.h" #include "qquicktransition_p.h" +#include "qquickanimator_p.h" #include <qqmlinfo.h> #include <private/qqmltypenotavailable_p.h> #include <private/qquickanimationcontroller_p.h> @@ -91,6 +92,14 @@ void QQuickUtilModule::defineModule() qmlRegisterType<QQuickTransition>("QtQuick",2,0,"Transition"); qmlRegisterType<QQuickVector3dAnimation>("QtQuick",2,0,"Vector3dAnimation"); + qmlRegisterUncreatableType<QQuickAnimator>("QtQuick", 2, 2, "Animator", QQuickAbstractAnimation::tr("Animator is an abstract class")); + qmlRegisterType<QQuickXAnimator>("QtQuick", 2, 2, "XAnimator"); + qmlRegisterType<QQuickYAnimator>("QtQuick", 2, 2, "YAnimator"); + qmlRegisterType<QQuickScaleAnimator>("QtQuick", 2, 2, "ScaleAnimator"); + qmlRegisterType<QQuickRotationAnimator>("QtQuick", 2, 2, "RotationAnimator"); + qmlRegisterType<QQuickOpacityAnimator>("QtQuick", 2, 2, "OpacityAnimator"); + qmlRegisterType<QQuickUniformAnimator>("QtQuick", 2, 2, "UniformAnimator"); + qmlRegisterType<QQuickStateOperation>(); qmlRegisterCustomType<QQuickPropertyChanges>("QtQuick",2,0,"PropertyChanges", new QQuickPropertyChangesParser); |