summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxcontentwrapper.h
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-06-30 23:38:45 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-06-30 23:38:45 (GMT)
commit61fcaa0e659e1bc676e0ce4124d49aaae565b26c (patch)
treee7071373a429da340e62bb7cfea0acb7029b63b4 /src/declarative/fx/qfxcontentwrapper.h
parent9681d2190541c63a39b2cfe70dc3aaa161ebe703 (diff)
downloadQt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.zip
Qt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.tar.gz
Qt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.tar.bz2
Support compile-in-namespace for the declarative module.
Diffstat (limited to 'src/declarative/fx/qfxcontentwrapper.h')
-rw-r--r--src/declarative/fx/qfxcontentwrapper.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxcontentwrapper.h b/src/declarative/fx/qfxcontentwrapper.h
index d8fe0b8..9a9a89c 100644
--- a/src/declarative/fx/qfxcontentwrapper.h
+++ b/src/declarative/fx/qfxcontentwrapper.h
@@ -44,12 +44,12 @@
#include <QtDeclarative/qfxitem.h>
-
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
+
class QFxContentWrapperPrivate;
class Q_DECLARATIVE_EXPORT QFxContentWrapper : public QFxItem
{
@@ -73,7 +73,6 @@ protected:
private:
Q_DECLARE_PRIVATE(QFxContentWrapper)
};
-QML_DECLARE_TYPE(QFxContentWrapper)
class Q_DECLARATIVE_EXPORT QFxContent : public QFxItem
{
@@ -81,10 +80,12 @@ class Q_DECLARATIVE_EXPORT QFxContent : public QFxItem
public:
QFxContent(QFxItem *parent=0) : QFxItem(parent) {}
};
-QML_DECLARE_TYPE(QFxContent)
QT_END_NAMESPACE
+QML_DECLARE_TYPE(QFxContentWrapper)
+QML_DECLARE_TYPE(QFxContent)
+
QT_END_HEADER
#endif // QFXCONTENTWRAPPER_H