From c01d404e29bceea903124070047141e27c68ea20 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Thu, 10 Dec 2009 13:54:54 +1000 Subject: Compile when a module. --- src/declarative/util/qmlanimation_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 #include #include -- cgit v0.12 From d3cd891de3ce28a19b9238d46c5462f7f1da1358 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Thu, 10 Dec 2009 14:29:56 +1000 Subject: Disable shared dynamic metaobjects for now. --- src/declarative/util/qmlopenmetaobject.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); -- cgit v0.12 From f9fc6217a5d51f7873bafa153189942f497baf2c Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Thu, 10 Dec 2009 14:36:40 +1000 Subject: doc --- src/declarative/util/qmlanimation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v0.12