From a9ebbe770a4d26dfebfd1f33133cb54cd211d49c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 1 Apr 2013 22:45:28 -0700 Subject: [PATCH] Fix autotest-exported class from QtQuick. Each class with a virtual table should have at least one non-inline member. Especially if it's exported (there's no point in exporting it otherwise). Change-Id: I6b2821faa9662c6e8b65ce9ced53332e1a18e8d9 Reviewed-by: Alan Alpert --- src/quick/util/qquickanimation.cpp | 5 +++++ src/quick/util/qquickanimation_p_p.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 8bbd3a7..f74ad20 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -2565,4 +2565,9 @@ QAbstractAnimationJob* QQuickPropertyAnimation::transition(QQuickStateActions &a return initInstance(animator); } +QQuickAnimationPropertyUpdater::~QQuickAnimationPropertyUpdater() +{ + if (wasDeleted) *wasDeleted = true; +} + QT_END_NAMESPACE diff --git a/src/quick/util/qquickanimation_p_p.h b/src/quick/util/qquickanimation_p_p.h index eb36a70..fb5f2d3 100644 --- a/src/quick/util/qquickanimation_p_p.h +++ b/src/quick/util/qquickanimation_p_p.h @@ -303,7 +303,7 @@ class Q_AUTOTEST_EXPORT QQuickAnimationPropertyUpdater : public QQuickBulkValueU { public: QQuickAnimationPropertyUpdater() : interpolatorType(0), interpolator(0), prevInterpolatorType(0), reverse(false), fromSourced(false), fromDefined(false), wasDeleted(0) {} - ~QQuickAnimationPropertyUpdater() { if (wasDeleted) *wasDeleted = true; } + ~QQuickAnimationPropertyUpdater(); void setValue(qreal v); -- 2.7.4