diff options
| author | Val Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-09-03 14:58:30 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-09-09 10:18:25 +0000 |
| commit | c9058d90d0b08781f14a494780c3094594c81f22 (patch) | |
| tree | 8bb8c9a4ae291c31681771e89720172637a7f0cd | |
| parent | b2a5fc61ad374503ace4c96c68fbfc5a6670b8fa (diff) | |
Deprecate QMediaServiceProviderPlugin
Reverts c018d5affdfca9c94a9797894c4092db53b7b101
[ChangeLog] QMediaServiceProviderHint, QMediaServiceProvider,
QMediaServiceProviderPlugin, QMediaServiceSupportedFormatsInterface,
QMediaServiceSupportedDevicesInterface,QMediaServiceDefaultDeviceInterface,
QMediaServiceCameraInfoInterface, QMediaServiceFeaturesInterface
classes are now deprecated.
Task-number: QTBUG-75943
Change-Id: I3e19166e3c7405beee1d93546d8982981e14cedb
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| -rw-r--r-- | src/multimedia/qmediaserviceprovider.cpp | 8 | ||||
| -rw-r--r-- | src/multimedia/qmediaserviceproviderplugin.h | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp index 023c13008..355f91bf2 100644 --- a/src/multimedia/qmediaserviceprovider.cpp +++ b/src/multimedia/qmediaserviceprovider.cpp @@ -85,6 +85,7 @@ public: /*! \class QMediaServiceProviderHint + \obsolete \brief The QMediaServiceProviderHint class describes what is required of a QMediaService. @@ -670,6 +671,7 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider); /*! \class QMediaServiceProvider + \obsolete \ingroup multimedia \ingroup multimedia_control \ingroup multimedia_core @@ -827,6 +829,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() /*! \class QMediaServiceProviderPlugin + \obsolete \inmodule QtMultimedia \brief The QMediaServiceProviderPlugin class interface provides an interface for QMediaService plug-ins. @@ -854,6 +857,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() /*! \class QMediaServiceSupportedFormatsInterface + \obsolete \inmodule QtMultimedia \brief The QMediaServiceSupportedFormatsInterface class interface identifies if a media service plug-in supports a media format. @@ -882,6 +886,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() /*! \class QMediaServiceSupportedDevicesInterface + \obsolete \inmodule QtMultimedia \brief The QMediaServiceSupportedDevicesInterface class interface identifies the devices supported by a media service plug-in. @@ -909,6 +914,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() /*! \class QMediaServiceDefaultDeviceInterface + \obsolete \inmodule QtMultimedia \brief The QMediaServiceDefaultDeviceInterface class interface identifies the default device used by a media service plug-in. @@ -932,6 +938,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() /*! \class QMediaServiceCameraInfoInterface + \obsolete \inmodule QtMultimedia \since 5.3 \brief The QMediaServiceCameraInfoInterface class interface @@ -961,6 +968,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() /*! \class QMediaServiceFeaturesInterface + \obsolete \inmodule QtMultimedia \brief The QMediaServiceFeaturesInterface class interface identifies features supported by a media service plug-in. diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h index 9afb4f4cd..6447e319a 100644 --- a/src/multimedia/qmediaserviceproviderplugin.h +++ b/src/multimedia/qmediaserviceproviderplugin.h @@ -50,8 +50,6 @@ # pragma Q_MOC_EXPAND_MACROS #endif -#if QT_DEPRECATED_SINCE(5, 14) - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -254,5 +252,4 @@ public: QT_END_NAMESPACE -#endif // #if QT_DEPRECATED_SINCE(5, 14) #endif // QMEDIASERVICEPROVIDERPLUGIN_H |