summaryrefslogtreecommitdiffstats
path: root/src/corelib/animation/qpropertyanimation_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/animation/qpropertyanimation_p.h')
-rw-r--r--src/corelib/animation/qpropertyanimation_p.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/corelib/animation/qpropertyanimation_p.h b/src/corelib/animation/qpropertyanimation_p.h
index ffa6114..3777aa0 100644
--- a/src/corelib/animation/qpropertyanimation_p.h
+++ b/src/corelib/animation/qpropertyanimation_p.h
@@ -54,7 +54,6 @@
//
#include "qpropertyanimation.h"
-#include <QtCore/qmetaobject.h>
#include "private/qvariantanimation_p.h"
@@ -67,20 +66,18 @@ class QPropertyAnimationPrivate : public QVariantAnimationPrivate
Q_DECLARE_PUBLIC(QPropertyAnimation)
public:
QPropertyAnimationPrivate()
- : target(0), propertyType(0), propertyIndex(0), hasMetaProperty(false)
+ : targetValue(0), propertyType(0), propertyIndex(-1)
{
}
- void _q_targetDestroyed();
-
- QObject *target;
+ QWeakPointer<QObject> target;
+ //we use targetValue to be able to unregister the target from the global hash
+ QObject *targetValue;
//for the QProperty
- QMetaProperty property;
int propertyType;
int propertyIndex;
- bool hasMetaProperty;
QByteArray propertyName;
void updateProperty(const QVariant &);
void updateMetaProperty();