diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-20 22:00:14 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-20 22:00:14 (GMT) |
| commit | dd97db856bc19d648d7faa3aac4e27576dcb2512 (patch) | |
| tree | 0bb9fde945a0d3883e6fa3291f807c8827bbb48c /src/declarative/util/qdeclarativeopenmetaobject_p.h | |
| parent | e4b0fe70c6435bb860df526d615dfdf53dfb5abd (diff) | |
| parent | 80f031dfca7c161de4461514dfd8d9d664ea2f03 (diff) | |
| download | Qt-dd97db856bc19d648d7faa3aac4e27576dcb2512.zip Qt-dd97db856bc19d648d7faa3aac4e27576dcb2512.tar.gz Qt-dd97db856bc19d648d7faa3aac4e27576dcb2512.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/declarative/util/qdeclarativeopenmetaobject_p.h')
| -rw-r--r-- | src/declarative/util/qdeclarativeopenmetaobject_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativeopenmetaobject_p.h b/src/declarative/util/qdeclarativeopenmetaobject_p.h index c18fa3d..dff6776 100644 --- a/src/declarative/util/qdeclarativeopenmetaobject_p.h +++ b/src/declarative/util/qdeclarativeopenmetaobject_p.h @@ -42,10 +42,11 @@ #ifndef QDECLARATIVEOPENMETAOBJECT_H #define QDECLARATIVEOPENMETAOBJECT_H -#include <private/qdeclarativerefcount_p.h> #include <QtCore/QMetaObject> #include <QtCore/QObject> +#include <private/qdeclarativerefcount_p.h> +#include <private/qdeclarativeglobal_p.h> #include <private/qobject_p.h> QT_BEGIN_HEADER @@ -57,7 +58,7 @@ QT_MODULE(Declarative) class QDeclarativeEngine; class QMetaPropertyBuilder; class QDeclarativeOpenMetaObjectTypePrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeOpenMetaObjectType : public QDeclarativeRefCount +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeOpenMetaObjectType : public QDeclarativeRefCount { public: QDeclarativeOpenMetaObjectType(const QMetaObject *base, QDeclarativeEngine *engine); @@ -78,7 +79,7 @@ private: }; class QDeclarativeOpenMetaObjectPrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeOpenMetaObject : public QAbstractDynamicMetaObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeOpenMetaObject : public QAbstractDynamicMetaObject { public: QDeclarativeOpenMetaObject(QObject *, bool = true); |