diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-12-10 15:42:18 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-10 20:22:09 +0100 |
| commit | 5809485dbed884d937e01a8d6e27e9b32eed32cb (patch) | |
| tree | 20fcb6e4d288d42b4334d8d55f724285396609db /tests/auto/corelib/animation | |
| parent | 903fa2e4aa0d4e0cf0e13216dd8883b5e4a7709d (diff) | |
Move a Q_DECLARE_METATYPE higher up in the file.
Having it low in the file causes ODR violations.
Change-Id: I6267c7c1b043e77b251a88cb8940a9f063160891
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/corelib/animation')
| -rw-r--r-- | tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp index f1e02c65a8..8539b76dc3 100644 --- a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp +++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp @@ -44,6 +44,8 @@ #include <QtCore/qvariantanimation.h> #include <QtWidgets/qwidget.h> +Q_DECLARE_METATYPE(QAbstractAnimation::State) + class UncontrolledAnimation : public QPropertyAnimation { Q_OBJECT @@ -699,7 +701,6 @@ struct Number }; Q_DECLARE_METATYPE(Number) -Q_DECLARE_METATYPE(QAbstractAnimation::State) QVariant numberInterpolator(const Number &f, const Number &t, qreal progress) { |