diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-30 23:38:45 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-30 23:38:45 (GMT) |
| commit | 61fcaa0e659e1bc676e0ce4124d49aaae565b26c (patch) | |
| tree | e7071373a429da340e62bb7cfea0acb7029b63b4 /src/declarative/widgets | |
| parent | 9681d2190541c63a39b2cfe70dc3aaa161ebe703 (diff) | |
| download | Qt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.zip Qt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.tar.gz Qt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.tar.bz2 | |
Support compile-in-namespace for the declarative module.
Diffstat (limited to 'src/declarative/widgets')
| -rw-r--r-- | src/declarative/widgets/graphicslayouts.h | 12 | ||||
| -rw-r--r-- | src/declarative/widgets/graphicswidgets.h | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/declarative/widgets/graphicslayouts.h b/src/declarative/widgets/graphicslayouts.h index 525a848..ab8ad90 100644 --- a/src/declarative/widgets/graphicslayouts.h +++ b/src/declarative/widgets/graphicslayouts.h @@ -52,9 +52,6 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -QML_DECLARE_INTERFACE(QGraphicsLayoutItem) -QML_DECLARE_INTERFACE(QGraphicsLayout) - class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem { Q_OBJECT @@ -64,7 +61,6 @@ public: virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const; }; -QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject) //TODO: // -content margins @@ -120,7 +116,6 @@ private: ChildList _children; }; -QML_DECLARE_TYPE(QGraphicsLinearLayoutObject) //TODO: // -content margins @@ -181,10 +176,15 @@ private: ChildList _children; }; -QML_DECLARE_TYPE(QGraphicsGridLayoutObject) QT_END_NAMESPACE +QML_DECLARE_INTERFACE(QGraphicsLayoutItem) +QML_DECLARE_INTERFACE(QGraphicsLayout) +QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject) +QML_DECLARE_TYPE(QGraphicsLinearLayoutObject) +QML_DECLARE_TYPE(QGraphicsGridLayoutObject) + QT_END_HEADER #endif // GRAPHICSLAYOUTS_H diff --git a/src/declarative/widgets/graphicswidgets.h b/src/declarative/widgets/graphicswidgets.h index e29f1d6..8147400 100644 --- a/src/declarative/widgets/graphicswidgets.h +++ b/src/declarative/widgets/graphicswidgets.h @@ -48,13 +48,15 @@ #include <QtGui/QGraphicsWidget> #include <QtGui/QGraphicsItem> -QT_BEGIN_NAMESPACE +QT_BEGIN_HEADER + +QT_MODULE(Declarative) QML_DECLARE_TYPE(QGraphicsView) QML_DECLARE_TYPE_HASMETATYPE(QGraphicsScene) QML_DECLARE_TYPE(QGraphicsWidget) QML_DECLARE_INTERFACE_HASMETATYPE(QGraphicsItem) -QT_END_NAMESPACE +QT_END_HEADER #endif // GRAPHICSWIDGETS_H |