diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2011-11-21 12:29:35 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-21 03:43:33 +0100 |
| commit | dd5a24522adf7498069b5b9dbee98674cf9cff18 (patch) | |
| tree | 118a00093bd62d698b68ad605ac719d135872412 /src/declarative/util | |
| parent | 8eb0e48a051771fe99bce75497e803d98d9253ad (diff) | |
Fix Qt Declarative namespace compilation.
Change-Id: Ib3294278985cd43e40610dacd7b69bf98ff4d788
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativelistcompositor.cpp | 4 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativelistmodel_p_p.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativelistcompositor.cpp b/src/declarative/util/qdeclarativelistcompositor.cpp index b8b4dbf054..02db70f09d 100644 --- a/src/declarative/util/qdeclarativelistcompositor.cpp +++ b/src/declarative/util/qdeclarativelistcompositor.cpp @@ -46,6 +46,8 @@ //#define QT_DECLARATIVE_VERIFY_MINIMAL //#define QT_DECLARATIVE_VERIFY_INTEGRITY +QT_BEGIN_NAMESPACE + #ifdef QT_DECLARATIVE_VERIFY_MINIMAL #define QT_DECLARATIVE_VERIFY_INTEGRITY static bool qt_verifyMinimal( @@ -1197,3 +1199,5 @@ QDebug operator <<(QDebug debug, const QDeclarativeListCompositor &list) } return (debug << ")").maybeSpace(); } + +QT_END_NAMESPACE diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h index 3c31950b9d..ab6c2b25cc 100644 --- a/src/declarative/util/qdeclarativelistmodel_p_p.h +++ b/src/declarative/util/qdeclarativelistmodel_p_p.h @@ -315,10 +315,10 @@ private: static QAtomicInt uidCounter; }; -Q_DECLARE_METATYPE(ListModel *); - QT_END_NAMESPACE +Q_DECLARE_METATYPE(ListModel *); + QT_END_HEADER #endif // QDECLARATIVELISTMODEL_P_P_H |