diff options
author | Volker Krause <volker.krause@kdab.com> | 2018-02-07 15:35:49 +0100 |
---|---|---|
committer | Volker Krause <volker.krause@kdab.com> | 2018-03-06 08:51:24 +0000 |
commit | 42a27f1a9ce319393a8e10a5f91b336e69fe2eb6 (patch) | |
tree | 03817af01fab8833162ca96e5b8d25d38e9f0c81 /src/animation | |
parent | 7ddb976ab22c5b75d3180e19ed4e27ff322a99af (diff) |
Either fully qualify property types, or not at all
The semi-qualified types confuse the meta type system, QAbstractAnimation
in particular, as that also exists as a top-level type.
Change-Id: If20387fe76d46f88f6a89523d5d3f4aac8b1fef0
Reviewed-by: Svenn-Arne Dragly <svenn-arne.dragly@qt.io>
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/animation')
-rw-r--r-- | src/animation/frontend/qabstractanimation.h | 2 | ||||
-rw-r--r-- | src/animation/frontend/qkeyframeanimation.h | 4 | ||||
-rw-r--r-- | src/animation/frontend/qmorphinganimation.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/animation/frontend/qabstractanimation.h b/src/animation/frontend/qabstractanimation.h index 0c6fe865e..951e2dd2d 100644 --- a/src/animation/frontend/qabstractanimation.h +++ b/src/animation/frontend/qabstractanimation.h @@ -52,7 +52,7 @@ class QT3DANIMATIONSHARED_EXPORT QAbstractAnimation : public QObject { Q_OBJECT Q_PROPERTY(QString animationName READ animationName WRITE setAnimationName NOTIFY animationNameChanged) - Q_PROPERTY(QAbstractAnimation::AnimationType animationType READ animationType CONSTANT) + Q_PROPERTY(AnimationType animationType READ animationType CONSTANT) Q_PROPERTY(float position READ position WRITE setPosition NOTIFY positionChanged) Q_PROPERTY(float duration READ duration NOTIFY durationChanged) diff --git a/src/animation/frontend/qkeyframeanimation.h b/src/animation/frontend/qkeyframeanimation.h index 19cb192b4..efc132cdd 100644 --- a/src/animation/frontend/qkeyframeanimation.h +++ b/src/animation/frontend/qkeyframeanimation.h @@ -57,8 +57,8 @@ class QT3DANIMATIONSHARED_EXPORT QKeyframeAnimation : public QAbstractAnimation Q_PROPERTY(Qt3DCore::QTransform *target READ target WRITE setTarget NOTIFY targetChanged) Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged) Q_PROPERTY(QString targetName READ targetName WRITE setTargetName NOTIFY targetNameChanged) - Q_PROPERTY(QKeyframeAnimation::RepeatMode startMode READ startMode WRITE setStartMode NOTIFY startModeChanged) - Q_PROPERTY(QKeyframeAnimation::RepeatMode endMode READ endMode WRITE setEndMode NOTIFY endModeChanged) + Q_PROPERTY(RepeatMode startMode READ startMode WRITE setStartMode NOTIFY startModeChanged) + Q_PROPERTY(RepeatMode endMode READ endMode WRITE setEndMode NOTIFY endModeChanged) public: explicit QKeyframeAnimation(QObject *parent = nullptr); diff --git a/src/animation/frontend/qmorphinganimation.h b/src/animation/frontend/qmorphinganimation.h index 2944fad91..09d0054c8 100644 --- a/src/animation/frontend/qmorphinganimation.h +++ b/src/animation/frontend/qmorphinganimation.h @@ -58,7 +58,7 @@ class QT3DANIMATIONSHARED_EXPORT QMorphingAnimation : public QAbstractAnimation Q_PROPERTY(float interpolator READ interpolator NOTIFY interpolatorChanged) Q_PROPERTY(Qt3DRender::QGeometryRenderer *target READ target WRITE setTarget NOTIFY targetChanged) Q_PROPERTY(QString targetName READ targetName WRITE setTargetName NOTIFY targetNameChanged) - Q_PROPERTY(QMorphingAnimation::Method method READ method WRITE setMethod NOTIFY methodChanged) + Q_PROPERTY(Method method READ method WRITE setMethod NOTIFY methodChanged) Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged) public: |