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/imports/testlib/main.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/imports/testlib/main.cpp')

diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp
index c12b9423a9..a6fb992fed 100644
--- a/src/imports/testlib/main.cpp
+++ b/src/imports/testlib/main.cpp
@@ -48,13 +48,14 @@
 #include "private/qtestoptions_p.h"
 #include "QtDeclarative/qsgitem.h"
 #include <QtDeclarative/private/qdeclarativeengine_p.h>
-QT_BEGIN_NAMESPACE
 
 QML_DECLARE_TYPE(QuickTestResult)
 QML_DECLARE_TYPE(QuickTestEvent)
 
 #include <QtDebug>
 
+QT_BEGIN_NAMESPACE
+
 class QuickTestUtil : public QObject
 {
     Q_OBJECT
@@ -145,8 +146,13 @@ public Q_SLOTS:
         return -1;
     }
 };
+
+QT_END_NAMESPACE
+
 QML_DECLARE_TYPE(QuickTestUtil)
 
+QT_BEGIN_NAMESPACE
+
 class QTestQmlModule : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
-- 
cgit v1.2.3