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/test | |
| 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/test')
| -rw-r--r-- | src/declarative/test/qfxtestengine.h | 4 | ||||
| -rw-r--r-- | src/declarative/test/qfxtestobjects.cpp | 12 | ||||
| -rw-r--r-- | src/declarative/test/qfxtestobjects.h | 5 | ||||
| -rw-r--r-- | src/declarative/test/qfxtestview.h | 5 |
4 files changed, 12 insertions, 14 deletions
diff --git a/src/declarative/test/qfxtestengine.h b/src/declarative/test/qfxtestengine.h index 44a140f..bce8eec 100644 --- a/src/declarative/test/qfxtestengine.h +++ b/src/declarative/test/qfxtestengine.h @@ -77,9 +77,9 @@ private: QFxTestEnginePrivate *d; }; -#endif // _QFXTESTENGINE_H_ - QT_END_NAMESPACE QT_END_HEADER + +#endif // _QFXTESTENGINE_H_ diff --git a/src/declarative/test/qfxtestobjects.cpp b/src/declarative/test/qfxtestobjects.cpp index 12fc7fb..5035b28 100644 --- a/src/declarative/test/qfxtestobjects.cpp +++ b/src/declarative/test/qfxtestobjects.cpp @@ -45,19 +45,19 @@ #include <QDebug> #include <QTextStream> +QML_DECLARE_TYPE(TestObject) +QML_DECLARE_TYPE(TestFrame) +QML_DECLARE_TYPE(TestFullFrame) +QML_DECLARE_TYPE(TestMouse) +QML_DECLARE_TYPE(TestKey) +QML_DECLARE_TYPE(TestLog) QT_BEGIN_NAMESPACE -QML_DECLARE_TYPE(TestObject) QML_DEFINE_TYPE(TestObject,TestObject) -QML_DECLARE_TYPE(TestFrame) QML_DEFINE_TYPE(TestFrame,TestFrame) -QML_DECLARE_TYPE(TestFullFrame) QML_DEFINE_TYPE(TestFullFrame,TestFullFrame) -QML_DECLARE_TYPE(TestMouse) QML_DEFINE_TYPE(TestMouse,TestMouse) -QML_DECLARE_TYPE(TestKey) QML_DEFINE_TYPE(TestKey,TestKey) -QML_DECLARE_TYPE(TestLog) QML_DEFINE_TYPE(TestLog,TestLog) static QString padding(int pad) diff --git a/src/declarative/test/qfxtestobjects.h b/src/declarative/test/qfxtestobjects.h index 80fcfe7..c8686ad 100644 --- a/src/declarative/test/qfxtestobjects.h +++ b/src/declarative/test/qfxtestobjects.h @@ -204,9 +204,8 @@ private: QList<TestObject *> _actions; }; -#endif // _QFXTESTOBJECTS_H_ - - QT_END_NAMESPACE QT_END_HEADER + +#endif // _QFXTESTOBJECTS_H_ diff --git a/src/declarative/test/qfxtestview.h b/src/declarative/test/qfxtestview.h index a8f78bf..353494d 100644 --- a/src/declarative/test/qfxtestview.h +++ b/src/declarative/test/qfxtestview.h @@ -66,9 +66,8 @@ private: QFxTestEngine *testEngine; }; -#endif // _QFXTESTVIEW_H_ - - QT_END_NAMESPACE QT_END_HEADER + +#endif // _QFXTESTVIEW_H_ |