From 85569dfdff1caec2efb714a1a9cdc64094893ec1 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Wed, 28 Sep 2011 09:57:04 +0200
Subject: Build with qt-in-namespace

Change-Id: Ia57e4f14d94ad63194dad52892bedf316a58a79a
Reviewed-on: http://codereview.qt-project.org/5693
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
---
 src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp | 3 +++
 src/declarative/items/qsgdragtarget.cpp                       | 2 ++
 src/declarative/items/qsgvisualadaptormodel.cpp               | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/declarative/items')

diff --git a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp b/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp
index 224f640abc..550ad77515 100644
--- a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp
+++ b/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp
@@ -46,6 +46,8 @@
 
 #define HAS_SHADOW(offsetX, offsetY, blur, color) (color.isValid() && color.alpha() && (blur || offsetX || offsetY))
 
+QT_BEGIN_NAMESPACE
+
 void qt_image_boxblur(QImage& image, int radius, bool quality);
 
 static QImage makeShadowImage(const QImage& image, qreal offsetX, qreal offsetY, qreal blur, const QColor& color)
@@ -394,4 +396,5 @@ void QSGContext2DCommandBuffer::reset()
     imageIdx = 0;
 }
 
+QT_END_NAMESPACE
 
diff --git a/src/declarative/items/qsgdragtarget.cpp b/src/declarative/items/qsgdragtarget.cpp
index 9ccc8703d4..5b6d36ee11 100644
--- a/src/declarative/items/qsgdragtarget.cpp
+++ b/src/declarative/items/qsgdragtarget.cpp
@@ -43,6 +43,8 @@
 #include "qsgitem_p.h"
 #include "qsgcanvas.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \qmlclass DragEvent QSGDragEvent
     \brief The DragEvent object provides information about a drag event.
diff --git a/src/declarative/items/qsgvisualadaptormodel.cpp b/src/declarative/items/qsgvisualadaptormodel.cpp
index 3eb6214e47..4e3a1a6dc3 100644
--- a/src/declarative/items/qsgvisualadaptormodel.cpp
+++ b/src/declarative/items/qsgvisualadaptormodel.cpp
@@ -64,10 +64,10 @@
 #include <QtCore/qhash.h>
 #include <QtCore/qlist.h>
 
-QT_BEGIN_NAMESPACE
-
 Q_DECLARE_METATYPE(QModelIndex)
 
+QT_BEGIN_NAMESPACE
+
 class VDMDelegateDataType : public QDeclarativeRefCount
 {
 public:
-- 
cgit v1.2.3