diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-11 03:59:01 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-11 03:59:01 (GMT) |
commit | 010dae33653c76359e857aadfbdfeb4841c01d2f (patch) | |
tree | 09cc7c453f723a0a0f8c0b43b996c80ffe244350 /src/declarative/util/qmlopenmetaobject.h | |
parent | 554999e97a350b3c04123a6ef03d21a841ab73ad (diff) | |
parent | a6fd1205fd5c375d603b0c225f9e03fa57473f29 (diff) | |
download | Qt-010dae33653c76359e857aadfbdfeb4841c01d2f.zip Qt-010dae33653c76359e857aadfbdfeb4841c01d2f.tar.gz Qt-010dae33653c76359e857aadfbdfeb4841c01d2f.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlopenmetaobject.h')
-rw-r--r-- | src/declarative/util/qmlopenmetaobject.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/declarative/util/qmlopenmetaobject.h b/src/declarative/util/qmlopenmetaobject.h index 17cecd87..f842f96 100644 --- a/src/declarative/util/qmlopenmetaobject.h +++ b/src/declarative/util/qmlopenmetaobject.h @@ -43,16 +43,16 @@ #define QMLOPENMETAOBJECT_H #include <QMetaObject> -#include "private/qmetaobjectbuilder_p.h" -#include <private/qobject_p.h> +#include <QtCore/private/qobject_p.h> #include <QObject> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Declarative) +class QmlOpenMetaObjectPrivate; +class QMetaPropertyBuilder; class Q_DECLARATIVE_EXPORT QmlOpenMetaObject : public QAbstractDynamicMetaObject { public: @@ -78,15 +78,8 @@ protected: private: int doCreateProperty(const char *); - bool autoCreate; - QAbstractDynamicMetaObject *parent; - int _propertyOffset; - int _signalOffset; - QList<QVariant> data; - QHash<QByteArray, int> names; - QMetaObjectBuilder mob; - QMetaObject *mem; - QObject *_object; + + QmlOpenMetaObjectPrivate *d; }; |