From dd5a24522adf7498069b5b9dbee98674cf9cff18 Mon Sep 17 00:00:00 2001
From: Toby Tomkins <toby.tomkins@nokia.com>
Date: Mon, 21 Nov 2011 12:29:35 +1000
Subject: [PATCH] Fix Qt Declarative namespace compilation.

Change-Id: Ib3294278985cd43e40610dacd7b69bf98ff4d788
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 src/declarative/items/qquickdroparea.cpp                         | 2 ++
 src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache.cpp | 1 +
 src/declarative/scenegraph/util/qsgdistancefieldutil.cpp         | 3 +++
 src/declarative/util/qdeclarativelistcompositor.cpp              | 4 ++++
 src/declarative/util/qdeclarativelistmodel_p_p.h                 | 4 ++--
 src/qtquick1/util/qdeclarativeutilmodule.cpp                     | 3 ++-
 6 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/declarative/items/qquickdroparea.cpp b/src/declarative/items/qquickdroparea.cpp
index b9b9308..6ea1467 100644
--- a/src/declarative/items/qquickdroparea.cpp
+++ b/src/declarative/items/qquickdroparea.cpp
@@ -46,6 +46,8 @@
 
 #include <private/qdeclarativeengine_p.h>
 
+QT_BEGIN_NAMESPACE
+
 QQuickDropAreaDrag::QQuickDropAreaDrag(QQuickDropAreaPrivate *d, QObject *parent)
     : QObject(parent)
     , d(d)
diff --git a/src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache.cpp b/src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
index 112fc5f..3dfa1bd 100644
--- a/src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
+++ b/src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
@@ -44,6 +44,7 @@
 #include <private/qsgdistancefieldutil_p.h>
 #include <qopenglfunctions.h>
 
+QT_BEGIN_NAMESPACE
 
 QHash<QString, QOpenGLMultiGroupSharedResource> QSGDefaultDistanceFieldGlyphCache::m_textures_data;
 
diff --git a/src/declarative/scenegraph/util/qsgdistancefieldutil.cpp b/src/declarative/scenegraph/util/qsgdistancefieldutil.cpp
index a74c96b..3429162 100644
--- a/src/declarative/scenegraph/util/qsgdistancefieldutil.cpp
+++ b/src/declarative/scenegraph/util/qsgdistancefieldutil.cpp
@@ -47,6 +47,7 @@
 #include <QtGui/private/qopenglengineshadersource_p.h>
 #include <private/qsgcontext_p.h>
 
+QT_BEGIN_NAMESPACE
 
 static float defaultThresholdFunc(float glyphScale)
 {
@@ -800,3 +801,5 @@ QSGDistanceFieldGlyphCache *QSGDistanceFieldGlyphCacheManager::cache(const QRawF
         cache = m_caches.insert(fontD->fontEngine, sgCtx->createDistanceFieldGlyphCache(font));
     return cache.value();
 }
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativelistcompositor.cpp b/src/declarative/util/qdeclarativelistcompositor.cpp
index b8b4dbf..02db70f 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 3c31950..ab6c2b2 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
diff --git a/src/qtquick1/util/qdeclarativeutilmodule.cpp b/src/qtquick1/util/qdeclarativeutilmodule.cpp
index 65afa36..5d9603b 100644
--- a/src/qtquick1/util/qdeclarativeutilmodule.cpp
+++ b/src/qtquick1/util/qdeclarativeutilmodule.cpp
@@ -72,6 +72,7 @@
 #include "QtQuick1/private/qdeclarativexmllistmodel_p.h"
 #endif
 
+QT_BEGIN_NAMESPACE
 
 void QDeclarative1UtilModule::defineModule(QDeclarativeQtQuick1Module::Module module)
 {
@@ -173,5 +174,5 @@ void QDeclarative1UtilModule::defineModule(QDeclarativeQtQuick1Module::Module mo
     }
 }
 
-
+QT_END_NAMESPACE
 
-- 
2.7.4