summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2010-02-24 09:14:25 (GMT)
committerhjk <qtc-committer@nokia.com>2010-02-24 09:14:25 (GMT)
commit63cb5d9dea14050db706ca69880a494db5a3c547 (patch)
treeb4c193bb4b5907ebad8350532a1ee66f787a6ac6
parentdd999ed377cdb2198cc9cbd405e636cc996ea4a7 (diff)
downloadQt-63cb5d9dea14050db706ca69880a494db5a3c547.zip
Qt-63cb5d9dea14050db706ca69880a494db5a3c547.tar.gz
Qt-63cb5d9dea14050db706ca69880a494db5a3c547.tar.bz2
compile fix with namespaces after a broken automatical merge
-rw-r--r--src/multimedia/base/qmediaserviceprovider.cpp2
1 files changed, 0 insertions, 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