diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 15:10:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 15:10:22 (GMT) |
| commit | 8b1b4b370c98c4c574123dd754d9628c90c9b3f6 (patch) | |
| tree | 59002a54fef4fd982bbab67b693d011c9fa4f83a /src/multimedia/base | |
| parent | 69b1784edb6dd82f26100d0e539bfa8a65bdd35d (diff) | |
| parent | d8c496523647e075220244978f2554bd266944f6 (diff) | |
| download | Qt-8b1b4b370c98c4c574123dd754d9628c90c9b3f6.zip Qt-8b1b4b370c98c4c574123dd754d9628c90c9b3f6.tar.gz Qt-8b1b4b370c98c4c574123dd754d9628c90c9b3f6.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Fix compilation with namespace.
Fix compilation with namespace.
Diffstat (limited to 'src/multimedia/base')
| -rw-r--r-- | src/multimedia/base/qmediaserviceprovider.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/multimedia/base/qmediaserviceprovider.cpp b/src/multimedia/base/qmediaserviceprovider.cpp index 8d1e0fa..eb97e16 100644 --- a/src/multimedia/base/qmediaserviceprovider.cpp +++ b/src/multimedia/base/qmediaserviceprovider.cpp @@ -48,7 +48,7 @@ #include "qmediapluginloader_p.h" #include <QtMultimedia/qmediaplayer.h> - +QT_BEGIN_NAMESPACE class QMediaServiceProviderHintPrivate : public QSharedData { @@ -594,6 +594,8 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() #endif } +QT_END_NAMESPACE + /*! \class QMediaServiceProviderPlugin \preliminary |