diff options
Diffstat (limited to 'src/multimedia/qmediaserviceprovider.cpp')
| -rw-r--r-- | src/multimedia/qmediaserviceprovider.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp index 849a9b602..48640faba 100644 --- a/src/multimedia/qmediaserviceprovider.cpp +++ b/src/multimedia/qmediaserviceprovider.cpp @@ -613,13 +613,11 @@ QString QMediaServiceProvider::deviceDescription(const QByteArray &serviceType, return QString(); } - -#ifdef QT_BUILD_INTERNAL - static QMediaServiceProvider *qt_defaultMediaServiceProvider = 0; /*! Sets a media service \a provider as the default. + It's useful for unit tests to provide mock service. \internal */ @@ -628,20 +626,15 @@ void QMediaServiceProvider::setDefaultServiceProvider(QMediaServiceProvider *pro qt_defaultMediaServiceProvider = provider; } -#endif /*! Returns a default provider of media services. */ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() { -#ifdef QT_BUILD_INTERNAL return qt_defaultMediaServiceProvider != 0 ? qt_defaultMediaServiceProvider : static_cast<QMediaServiceProvider *>(pluginProvider()); -#else - return pluginProvider(); -#endif } /*! |