From 5809485dbed884d937e01a8d6e27e9b32eed32cb Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 10 Dec 2012 15:42:18 +0100 Subject: 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 --- .../corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp') 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 #include +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) { -- cgit v1.2.3