diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 18:31:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 18:31:42 (GMT) |
| commit | fcdecd732d2fd6a863e903239f71c8f050c88dd0 (patch) | |
| tree | 075a5e417683d4f0cdb9a7e41d749c8047cf9bdf /src/multimedia/base | |
| parent | 69b1784edb6dd82f26100d0e539bfa8a65bdd35d (diff) | |
| parent | cc27aa0066a4fd6641be164800942cba4fa1d73f (diff) | |
| download | Qt-fcdecd732d2fd6a863e903239f71c8f050c88dd0.zip Qt-fcdecd732d2fd6a863e903239f71c8f050c88dd0.tar.gz Qt-fcdecd732d2fd6a863e903239f71c8f050c88dd0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (30 commits)
Second attempt at work-around for MSVC2008 compiler crash
QNativeSocketEngine: Fix some error handling related to waitFor*()
qdoc: List new QML elements in \sincelist for What's New page.
Cocoa: fix namespace build
Cocoa: Fix build with namespace
Cocoa: namespace build fix
doc: Fixed some qdoc errors.
Don't include private headers from public headers.
Fix compilation on HP-UXi: m_volume is a #define
WinCE doesn't have sys/types.h
Fix compilation: qmlviewer cannot use symbols exported with Q_AUTOTEST_EXPORT in production builds
Fix compilation on recent Linux systems: getpid(2) is in unistd.h.
Cocoa: calling QEventLoop::exec from mouse up causes problem
Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined)
Doc: Collected the Declarative UI tutorials together and renamed them.
Doc: Simplified Commercial Editions for Qt 4.7.
Work around MSVC2008 compiler crash
doc: Added "\since 4.7" to a bunch of declarative stuff.
Cocoa: event dispatcher eats mouse events
Fix an issue about double-click on Mac OS X.
...
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..02c9b29 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 { @@ -697,5 +697,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() Returns a set of features supported by a plug-in \a service. */ +QT_END_NAMESPACE + #include "moc_qmediaserviceprovider.cpp" #include "moc_qmediaserviceproviderplugin.cpp" |