diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-10 06:42:28 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-10 06:42:28 (GMT) |
| commit | dd4a244801eb9fa5f283fd0d5c1300dd4b717be7 (patch) | |
| tree | 3aba1d7e642fe2635625f0504671c3e0ff2667af | |
| parent | 4768a1ee67945e09d7f94cf881eb9c4a56e9c969 (diff) | |
| parent | 1e51e44e094039b62b7f25f18511ce1a37b9efa1 (diff) | |
| download | Qt-dd4a244801eb9fa5f283fd0d5c1300dd4b717be7.zip Qt-dd4a244801eb9fa5f283fd0d5c1300dd4b717be7.tar.gz Qt-dd4a244801eb9fa5f283fd0d5c1300dd4b717be7.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | src/declarative/util/qmlanimation.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/util/qmlanimation_p.h | 2 | ||||
| -rw-r--r-- | src/declarative/util/qmlopenmetaobject.cpp | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 1b01741..4c5015d 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -1380,7 +1380,7 @@ QML_DEFINE_TYPE(Qt,4,6,NumberAnimation,QmlNumberAnimation) /*! \internal - \class Vector3dAnimation + \class QmlVector3dAnimation */ QmlVector3dAnimation::QmlVector3dAnimation(QObject *parent) diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h index a208742..a52c36e 100644 --- a/src/declarative/util/qmlanimation_p.h +++ b/src/declarative/util/qmlanimation_p.h @@ -44,7 +44,7 @@ #include "qmltransition_p.h" #include "qmlstate_p.h" -#include "../../gui/math3d/qvector3d.h" +#include <QtGui/qvector3d.h> #include <qmlpropertyvaluesource.h> #include <qml.h> diff --git a/src/declarative/util/qmlopenmetaobject.cpp b/src/declarative/util/qmlopenmetaobject.cpp index 473d9d9..1b2c2bd 100644 --- a/src/declarative/util/qmlopenmetaobject.cpp +++ b/src/declarative/util/qmlopenmetaobject.cpp @@ -145,7 +145,9 @@ QmlOpenMetaObject::QmlOpenMetaObject(QObject *obj, QmlOpenMetaObjectType *type, d->autoCreate = automatic; d->object = obj; - d->type = type; +// d->type = type; + d->type = new QmlOpenMetaObjectType(0); + d->ownType = true; d->type->d->init(obj); QObjectPrivate *op = QObjectPrivate::get(obj); |