10 files changed, 24 insertions, 109 deletions
diff --git a/src/animation/frontend/frontend.pri b/src/animation/frontend/frontend.pri
deleted file mode 100644
index ccf433318..000000000
--- a/src/animation/frontend/frontend.pri
+++ /dev/null
@@ -1,86 +0,0 @@
-HEADERS += \
-    $$PWD/qanimationaspect.h \
-    $$PWD/qanimationaspect_p.h \
-    $$PWD/qabstractclipanimator.h \
-    $$PWD/qabstractclipanimator_p.h \
-    $$PWD/qabstractanimationclip.h \
-    $$PWD/qabstractanimationclip_p.h \
-    $$PWD/qabstractclipblendnode.h \
-    $$PWD/qabstractclipblendnode_p.h \
-    $$PWD/qclipanimator.h \
-    $$PWD/qclipanimator_p.h \
-    $$PWD/qblendedclipanimator.h \
-    $$PWD/qblendedclipanimator_p.h \
-    $$PWD/qchannelmapper.h \
-    $$PWD/qchannelmapper_p.h \
-    $$PWD/qchannelmapping.h \
-    $$PWD/qchannelmapping_p.h \
-    $$PWD/qanimationcontroller.h \
-    $$PWD/qanimationcontroller_p.h \
-    $$PWD/qanimationgroup.h \
-    $$PWD/qanimationgroup_p.h \
-    $$PWD/qkeyframeanimation.h \
-    $$PWD/qkeyframeanimation_p.h \
-    $$PWD/qmorphinganimation.h \
-    $$PWD/qmorphinganimation_p.h \
-    $$PWD/qabstractanimation.h \
-    $$PWD/qabstractanimation_p.h \
-    $$PWD/qmorphtarget.h \
-    $$PWD/qmorphtarget_p.h \
-    $$PWD/qvertexblendanimation.h \
-    $$PWD/qvertexblendanimation_p.h \
-    $$PWD/qanimationcliploader.h \
-    $$PWD/qanimationclip_p.h \
-    $$PWD/qlerpclipblend.h \
-    $$PWD/qlerpclipblend_p.h \
-    $$PWD/qadditiveclipblend.h \
-    $$PWD/qadditiveclipblend_p.h \
-    $$PWD/qclipblendvalue.h \
-    $$PWD/qclipblendvalue_p.h \
-    $$PWD/qanimationclipdata.h \
-    $$PWD/qchannel.h \
-    $$PWD/qchannelcomponent.h \
-    $$PWD/qkeyframe.h \
-    $$PWD/qanimationclip.h \
-    $$PWD/qanimationclip_p.h \
-    $$PWD/qanimationcallback.h \
-    $$PWD/qclock.h \
-    $$PWD/qclock_p.h \
-    $$PWD/qabstractchannelmapping.h \
-    $$PWD/qabstractchannelmapping_p.h \
-    $$PWD/qskeletonmapping.h \
-    $$PWD/qskeletonmapping_p.h \
-    $$PWD/qcallbackmapping.h \
-    $$PWD/qcallbackmapping_p.h
-
-SOURCES += \
-    $$PWD/qanimationaspect.cpp \
-    $$PWD/qabstractclipanimator.cpp \
-    $$PWD/qabstractanimationclip.cpp \
-    $$PWD/qabstractclipblendnode.cpp \
-    $$PWD/qclipanimator.cpp \
-    $$PWD/qblendedclipanimator.cpp \
-    $$PWD/qchannelmapper.cpp \
-    $$PWD/qchannelmapping.cpp \
-    $$PWD/qanimationcontroller.cpp \
-    $$PWD/qanimationgroup.cpp \
-    $$PWD/qkeyframeanimation.cpp \
-    $$PWD/qmorphinganimation.cpp \
-    $$PWD/qabstractanimation.cpp \
-    $$PWD/qmorphtarget.cpp \
-    $$PWD/qvertexblendanimation.cpp \
-    $$PWD/qanimationcliploader.cpp \
-    $$PWD/qlerpclipblend.cpp \
-    $$PWD/qadditiveclipblend.cpp \
-    $$PWD/qclipblendvalue.cpp \
-    $$PWD/qanimationclipdata.cpp \
-    $$PWD/qchannel.cpp \
-    $$PWD/qchannelcomponent.cpp \
-    $$PWD/qkeyframe.cpp \
-    $$PWD/qanimationclip.cpp \
-    $$PWD/qclock.cpp \
-    $$PWD/qabstractchannelmapping.cpp \
-    $$PWD/qskeletonmapping.cpp \
-    $$PWD/qcallbackmapping.cpp
-
-INCLUDEPATH += $$PWD
diff --git a/src/animation/frontend/qabstractanimation.cpp b/src/animation/frontend/qabstractanimation.cpp
index 0357b60f5..7e8ab25c0 100644
--- a/src/animation/frontend/qabstractanimation.cpp
+++ b/src/animation/frontend/qabstractanimation.cpp
@@ -36,7 +36,7 @@ namespace Qt3DAnimation {
     duration, while leaving the actual animating for the subtypes.
 */
 /*!
-    \enum QAbstractAnimation::AnimationType
+    \enum Qt3DAnimation::QAbstractAnimation::AnimationType
 
     This enumeration specifies the type of the animation
     \value KeyframeAnimation Simple keyframe animation implementation for QTransform
@@ -61,11 +61,11 @@ namespace Qt3DAnimation {
 */
 
 /*!
-    \qmlproperty string AbstractAnimation::animationName
+    \qmlproperty string Qt3D.Animation::AbstractAnimation::animationName
     Holds the name of the animation.
 */
 /*!
-    \qmlproperty enumeration AbstractAnimation::animationType
+    \qmlproperty enumeration Qt3D.Animation::AbstractAnimation::animationType
     Holds the type of the animation.
     \list
     \li KeyframeAnimation
@@ -74,11 +74,11 @@ namespace Qt3DAnimation {
     \endlist
 */
 /*!
-    \qmlproperty real AbstractAnimation::position
+    \qmlproperty real Qt3D.Animation::AbstractAnimation::position
     Holds the current position of the animation.
 */
 /*!
-    \qmlproperty real AbstractAnimation::duration
+    \qmlproperty real Qt3D.Animation::AbstractAnimation::duration
     Holds the duration of the animation.
 */
 
diff --git a/src/animation/frontend/qabstractanimationclip.cpp b/src/animation/frontend/qabstractanimationclip.cpp
index 0dabe9c16..a176ca98a 100644
--- a/src/animation/frontend/qabstractanimationclip.cpp
+++ b/src/animation/frontend/qabstractanimationclip.cpp
@@ -108,7 +108,7 @@ QAbstractAnimationClip::~QAbstractAnimationClip()
 }
 
 /*!
-    \property QAbstractAnimationClip::duration
+    \property Qt3DAnimation::QAbstractAnimationClip::duration
 
     Holds the duration of the animation clip in seconds. Gets updated once the
     animation data is provided to Qt 3D using one of the concrete subclasses.
diff --git a/src/animation/frontend/qabstractclipanimator.cpp b/src/animation/frontend/qabstractclipanimator.cpp
index a095cba24..fe5e85385 100644
--- a/src/animation/frontend/qabstractclipanimator.cpp
+++ b/src/animation/frontend/qabstractclipanimator.cpp
@@ -90,7 +90,7 @@ QAbstractClipAnimator::~QAbstractClipAnimator()
 {
 }
 /*!
-    \qmlproperty bool Qt3DAnimation::AbstractClipAnimator::running
+    \qmlproperty bool Qt3D.Animation::AbstractClipAnimator::running
 
     This property holds a boolean indicating whether the animation is currently running.
 */
@@ -111,7 +111,7 @@ bool QAbstractClipAnimator::isRunning() const
 }
 
 /*!
-    \qmlproperty ChannelMapper Qt3DAnimation::AbstractClipAnimator::channelMapper
+    \qmlproperty ChannelMapper Qt3D.Animation::AbstractClipAnimator::channelMapper
 
     This property holds the ChannelMapper that controls how the channels in
     the animation clip map onto the properties of the target objects.
@@ -131,7 +131,7 @@ QChannelMapper *QAbstractClipAnimator::channelMapper() const
 }
 
 /*!
-    \qmlproperty int Qt3DAnimation::AbstractClipAnimator::loops
+    \qmlproperty int Qt3D.Animation::AbstractClipAnimator::loops
 
     This property holds the number of times the animation should play.
 
@@ -141,7 +141,7 @@ QChannelMapper *QAbstractClipAnimator::channelMapper() const
     repeat until it is explicitly stopped.
 */
 /*!
-    \enum QAbstractClipAnimator::Loops
+    \enum Qt3DAnimation::QAbstractClipAnimator::Loops
 
     Holds the number of times the animation should play.
 
@@ -175,7 +175,7 @@ int QAbstractClipAnimator::loopCount() const
     return d->m_loops;
 }
 /*!
-    \qmlproperty Clock Qt3DAnimation::AbstractClipAnimator::clock
+    \qmlproperty Clock Qt3D.Animation::AbstractClipAnimator::clock
 
     The clock controls the speed with which an animation is played.
 */
@@ -191,7 +191,7 @@ QClock *QAbstractClipAnimator::clock() const
     return d->m_clock;
 }
 /*!
-    \qmlproperty real Qt3DAnimation::AbstractClipAnimator::normalizedTime
+    \qmlproperty real Qt3D.Animation::AbstractClipAnimator::normalizedTime
 
     This property holds the clips normalized time.
 */
diff --git a/src/animation/frontend/qadditiveclipblend.cpp b/src/animation/frontend/qadditiveclipblend.cpp
index bd1f11d19..9785e2fbe 100644
--- a/src/animation/frontend/qadditiveclipblend.cpp
+++ b/src/animation/frontend/qadditiveclipblend.cpp
@@ -102,13 +102,13 @@ QAdditiveClipBlend::~QAdditiveClipBlend()
 }
 
 /*!
-    \qmlproperty real AdditiveClipBlend::additiveFactor
+    \qmlproperty real Qt3D.Animation::AdditiveClipBlend::additiveFactor
 
     Specifies the blending factor, typically between 0 and 1, to control the blending of
     two animation clips.
 */
 /*!
-    \property QAdditiveClipBlend::additiveFactor
+    \property Qt3DAnimation::QAdditiveClipBlend::additiveFactor
 
     Specifies the blending factor, typically between 0 and 1, to control the blending of
     two animation clips.
@@ -126,7 +126,7 @@ float QAdditiveClipBlend::additiveFactor() const
     also be the resulting clip of this blend node.
 */
 /*!
-    \property QAdditiveClipBlend::baseClip
+    \property Qt3DAnimation::QAdditiveClipBlend::baseClip
 
     This property holds the base animation clip. When the additiveFactor
     is zero the baseClip will also be the resulting clip of this blend node.
@@ -144,7 +144,7 @@ QAbstractClipBlendNode *QAdditiveClipBlend::baseClip() const
     is controlled by the additiveFactor property.
 */
 /*!
-    \property QAdditiveClipBlend::additiveClip
+    \property Qt3DAnimation::QAdditiveClipBlend::additiveClip
 
     This property holds the additive clip to be blended with the baseClip. The amount of blending
     is controlled by the additiveFactor property.
diff --git a/src/animation/frontend/qanimationaspect.cpp b/src/animation/frontend/qanimationaspect.cpp
index 40edc5c42..00d9d6281 100644
--- a/src/animation/frontend/qanimationaspect.cpp
+++ b/src/animation/frontend/qanimationaspect.cpp
@@ -23,10 +23,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DAnimation {
 
+using namespace Qt3DCore;
+
 QAnimationAspectPrivate::QAnimationAspectPrivate()
     : QAbstractAspectPrivate()
     , m_handler(new Animation::Handler)
diff --git a/src/animation/frontend/qblendedclipanimator.cpp b/src/animation/frontend/qblendedclipanimator.cpp
index 2abbe2184..b44fbd97d 100644
--- a/src/animation/frontend/qblendedclipanimator.cpp
+++ b/src/animation/frontend/qblendedclipanimator.cpp
@@ -239,7 +239,7 @@ QBlendedClipAnimator::~QBlendedClipAnimator()
     be evaluated before being interpolated by the animator.
 */
 /*!
-    \property QBlendedClipAnimator::blendTree
+    \property Qt3DAnimation::QBlendedClipAnimator::blendTree
 
     This property holds the root of the animation blend tree that will be evaluated before being
     interpolated by the animator.
diff --git a/src/animation/frontend/qclipanimator.cpp b/src/animation/frontend/qclipanimator.cpp
index b39c31eec..f854337fd 100644
--- a/src/animation/frontend/qclipanimator.cpp
+++ b/src/animation/frontend/qclipanimator.cpp
@@ -97,7 +97,7 @@ QClipAnimator::~QClipAnimator()
     The key frame data can be specified in either an AnimationClip or AnimationClipLoader.
 */
 /*!
-    \property QClipAnimator::clip
+    \property Qt3DAnimation::QClipAnimator::clip
 
     This property holds the animation clip which contains the key frame data to be played back.
     The key frame data can be specified in either a QAnimationClip or QAnimationClipLoader.
diff --git a/src/animation/frontend/qkeyframeanimation.cpp b/src/animation/frontend/qkeyframeanimation.cpp
index 4c97c6cfd..95b9be45e 100644
--- a/src/animation/frontend/qkeyframeanimation.cpp
+++ b/src/animation/frontend/qkeyframeanimation.cpp
@@ -71,7 +71,7 @@ namespace Qt3DAnimation {
     Holds the repeat mode for the position values greater than the last frame position.
 */
 /*!
-    \enum QKeyframeAnimation::RepeatMode
+    \enum Qt3DAnimation::QKeyframeAnimation::RepeatMode
 
     This enumeration specifies how position values outside keyframe values are handled.
     \value None The animation is not applied to the target transform.
diff --git a/src/animation/frontend/qlerpclipblend.cpp b/src/animation/frontend/qlerpclipblend.cpp
index 30a30c394..f83e419d0 100644
--- a/src/animation/frontend/qlerpclipblend.cpp
+++ b/src/animation/frontend/qlerpclipblend.cpp
@@ -79,7 +79,7 @@ QLerpClipBlend::~QLerpClipBlend()
     two animation clips.
 */
 /*!
-    \property QLerpClipBlend::blendFactor
+    \property Qt3DAnimation::QLerpClipBlend::blendFactor
 
     Specifies the blending factor between 0 and 1 to control the blending of
     two animation clips.
@@ -98,7 +98,7 @@ float QLerpClipBlend::blendFactor() const
     the blendFactor is set to a value of 0.
 */
 /*!
-    \property QLerpClipBlend::startClip
+    \property Qt3DAnimation::QLerpClipBlend::startClip
 
     Holds the sub-tree that should be used as the start clip for this
     lerp blend node. That is, the clip returned by this blend node when
@@ -118,7 +118,7 @@ Qt3DAnimation::QAbstractClipBlendNode *QLerpClipBlend::startClip() const
     the blendFactor is set to a value of 1.
 */
 /*!
-    \property QLerpClipBlend::endClip
+    \property Qt3DAnimation::QLerpClipBlend::endClip
 
     Holds the sub-tree that should be used as the start clip for this
     lerp blend node. That is, the clip returned by this blend node when