From 63cb5d9dea14050db706ca69880a494db5a3c547 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 24 Feb 2010 10:14:25 +0100
Subject: compile fix with namespaces after a broken automatical merge

---
 src/multimedia/base/qmediaserviceprovider.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/multimedia/base/qmediaserviceprovider.cpp b/src/multimedia/base/qmediaserviceprovider.cpp
index 76377d9..02c9b29 100644
--- a/src/multimedia/base/qmediaserviceprovider.cpp
+++ b/src/multimedia/base/qmediaserviceprovider.cpp
@@ -594,8 +594,6 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider()
 #endif
 }
 
-QT_END_NAMESPACE
-
 /*!
     \class QMediaServiceProviderPlugin
     \preliminary
-- 
cgit v0.12