diff options
| author | hjk <qtc-committer@nokia.com> | 2010-02-24 09:14:25 (GMT) |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2010-02-24 09:14:25 (GMT) |
| commit | 63cb5d9dea14050db706ca69880a494db5a3c547 (patch) | |
| tree | b4c193bb4b5907ebad8350532a1ee66f787a6ac6 /src/multimedia | |
| parent | dd999ed377cdb2198cc9cbd405e636cc996ea4a7 (diff) | |
| download | Qt-63cb5d9dea14050db706ca69880a494db5a3c547.zip Qt-63cb5d9dea14050db706ca69880a494db5a3c547.tar.gz Qt-63cb5d9dea14050db706ca69880a494db5a3c547.tar.bz2 | |
compile fix with namespaces after a broken automatical merge
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/base/qmediaserviceprovider.cpp | 2 |
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 |