AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move a Q_DECLARE_METATYPE higher up in the file.

Browse Source 
Having it low in the file causes ODR violations.

Change-Id: I6267c7c1b043e77b251a88cb8940a9f063160891
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Stephen Kelly 2012-12-10 15:42:18 +01:00 committed by The Qt Project
parent 903fa2e4aa
commit 5809485dbe
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
View File

@ -44,6 +44,8 @@
#include <QtCore/qvariantanimation.h> #include <QtCore/qvariantanimation.h>
#include <QtWidgets/qwidget.h> #include <QtWidgets/qwidget.h>
Q_DECLARE_METATYPE(QAbstractAnimation::State)
class UncontrolledAnimation : public QPropertyAnimation class UncontrolledAnimation : public QPropertyAnimation
{ {
Q_OBJECT Q_OBJECT
@ -699,7 +701,6 @@ struct Number
}; };
Q_DECLARE_METATYPE(Number) Q_DECLARE_METATYPE(Number)
Q_DECLARE_METATYPE(QAbstractAnimation::State)
QVariant numberInterpolator(const Number &f, const Number &t, qreal progress) QVariant numberInterpolator(const Number &f, const Number &t, qreal progress)
{ {