From d509b9d8375c1ca7dba6d236a06b6c49011a981c Mon Sep 17 00:00:00 2001
From: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Mon, 12 Aug 2019 13:21:08 +0200
Subject: Deprecate QMediaService and QMediaControl

Will be moved to private API.

[ChangeLog] QMediaService and QMediaControl classes are now deprecated.

Task-number: QTBUG-75943
Change-Id: Ic40013ea52301cad812886e22940efa3b096f875
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 src/multimedia/controls/qaudiodecodercontrol.cpp              | 1 +
 src/multimedia/controls/qaudioencodersettingscontrol.cpp      | 1 +
 src/multimedia/controls/qaudioinputselectorcontrol.cpp        | 1 +
 src/multimedia/controls/qaudiooutputselectorcontrol.cpp       | 1 +
 src/multimedia/controls/qaudiorolecontrol.cpp                 | 1 +
 src/multimedia/controls/qcameracapturebufferformatcontrol.cpp | 1 +
 src/multimedia/controls/qcameracapturedestinationcontrol.cpp  | 1 +
 src/multimedia/controls/qcameracontrol.cpp                    | 1 +
 src/multimedia/controls/qcameraexposurecontrol.cpp            | 1 +
 src/multimedia/controls/qcamerafeedbackcontrol.cpp            | 1 +
 src/multimedia/controls/qcameraflashcontrol.cpp               | 1 +
 src/multimedia/controls/qcamerafocuscontrol.cpp               | 1 +
 src/multimedia/controls/qcameraimagecapturecontrol.cpp        | 1 +
 src/multimedia/controls/qcameraimageprocessingcontrol.cpp     | 1 +
 src/multimedia/controls/qcamerainfocontrol.cpp                | 1 +
 src/multimedia/controls/qcameralockscontrol.cpp               | 1 +
 src/multimedia/controls/qcameraviewfindersettingscontrol.cpp  | 1 +
 src/multimedia/controls/qcamerazoomcontrol.cpp                | 1 +
 src/multimedia/controls/qcustomaudiorolecontrol.cpp           | 1 +
 src/multimedia/controls/qimageencodercontrol.cpp              | 1 +
 src/multimedia/controls/qmediaaudioprobecontrol.cpp           | 1 +
 src/multimedia/controls/qmediaavailabilitycontrol.cpp         | 1 +
 src/multimedia/controls/qmediacontainercontrol.cpp            | 1 +
 src/multimedia/controls/qmediagaplessplaybackcontrol.cpp      | 1 +
 src/multimedia/controls/qmedianetworkaccesscontrol.cpp        | 1 +
 src/multimedia/controls/qmediaplayercontrol.cpp               | 1 +
 src/multimedia/controls/qmediarecordercontrol.cpp             | 1 +
 src/multimedia/controls/qmediastreamscontrol.cpp              | 1 +
 src/multimedia/controls/qmediavideoprobecontrol.cpp           | 1 +
 src/multimedia/controls/qmetadatareadercontrol.cpp            | 1 +
 src/multimedia/controls/qmetadatawritercontrol.cpp            | 1 +
 src/multimedia/controls/qradiodatacontrol.cpp                 | 1 +
 src/multimedia/controls/qradiotunercontrol.cpp                | 2 +-
 src/multimedia/controls/qvideodeviceselectorcontrol.cpp       | 1 +
 src/multimedia/controls/qvideoencodersettingscontrol.cpp      | 1 +
 src/multimedia/controls/qvideorenderercontrol.cpp             | 1 +
 src/multimedia/controls/qvideowindowcontrol.cpp               | 1 +
 37 files changed, 37 insertions(+), 1 deletion(-)

(limited to 'src/multimedia/controls')

diff --git a/src/multimedia/controls/qaudiodecodercontrol.cpp b/src/multimedia/controls/qaudiodecodercontrol.cpp
index 4d6d36a2f..711303174 100644
--- a/src/multimedia/controls/qaudiodecodercontrol.cpp
+++ b/src/multimedia/controls/qaudiodecodercontrol.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QAudioDecoderControl
+    \obsolete
     \inmodule QtMultimedia
 
 
diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.cpp b/src/multimedia/controls/qaudioencodersettingscontrol.cpp
index 42f20201c..5ae473178 100644
--- a/src/multimedia/controls/qaudioencodersettingscontrol.cpp
+++ b/src/multimedia/controls/qaudioencodersettingscontrol.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QAudioEncoderSettingsControl
+    \obsolete
     \inmodule QtMultimedia
 
     \ingroup multimedia_control
diff --git a/src/multimedia/controls/qaudioinputselectorcontrol.cpp b/src/multimedia/controls/qaudioinputselectorcontrol.cpp
index 0f8843808..649891225 100644
--- a/src/multimedia/controls/qaudioinputselectorcontrol.cpp
+++ b/src/multimedia/controls/qaudioinputselectorcontrol.cpp
@@ -43,6 +43,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QAudioInputSelectorControl
+    \obsolete
 
     \brief The QAudioInputSelectorControl class provides an audio input selector media control.
     \inmodule QtMultimedia
diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.cpp b/src/multimedia/controls/qaudiooutputselectorcontrol.cpp
index 20c792f8d..64886e4c9 100644
--- a/src/multimedia/controls/qaudiooutputselectorcontrol.cpp
+++ b/src/multimedia/controls/qaudiooutputselectorcontrol.cpp
@@ -43,6 +43,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QAudioOutputSelectorControl
+    \obsolete
 
     \brief The QAudioOutputSelectorControl class provides an audio output selector media control.
     \inmodule QtMultimedia
diff --git a/src/multimedia/controls/qaudiorolecontrol.cpp b/src/multimedia/controls/qaudiorolecontrol.cpp
index 7b2341846..01e60a914 100644
--- a/src/multimedia/controls/qaudiorolecontrol.cpp
+++ b/src/multimedia/controls/qaudiorolecontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QAudioRoleControl
+    \obsolete
     \inmodule QtMultimedia
     \ingroup multimedia_control
     \since 5.6
diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp
index 553414681..8f0c3e6e9 100644
--- a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp
+++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp
@@ -43,6 +43,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraCaptureBufferFormatControl
+    \obsolete
 
     \brief The QCameraCaptureBufferFormatControl class provides a control for setting the capture buffer format.
 
diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.cpp b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp
index e037ab5a9..a9a54a3b8 100644
--- a/src/multimedia/controls/qcameracapturedestinationcontrol.cpp
+++ b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraCaptureDestinationControl
+    \obsolete
 
     \brief The QCameraCaptureDestinationControl class provides a control for setting capture destination.
 
diff --git a/src/multimedia/controls/qcameracontrol.cpp b/src/multimedia/controls/qcameracontrol.cpp
index 03a7a073c..d33fa94c9 100644
--- a/src/multimedia/controls/qcameracontrol.cpp
+++ b/src/multimedia/controls/qcameracontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraControl
+    \obsolete
 
 
 
diff --git a/src/multimedia/controls/qcameraexposurecontrol.cpp b/src/multimedia/controls/qcameraexposurecontrol.cpp
index 1434f0976..2095c9cfa 100644
--- a/src/multimedia/controls/qcameraexposurecontrol.cpp
+++ b/src/multimedia/controls/qcameraexposurecontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraExposureControl
+    \obsolete
 
     \brief The QCameraExposureControl class allows controlling camera exposure parameters.
 
diff --git a/src/multimedia/controls/qcamerafeedbackcontrol.cpp b/src/multimedia/controls/qcamerafeedbackcontrol.cpp
index 07074d83d..42cd7d661 100644
--- a/src/multimedia/controls/qcamerafeedbackcontrol.cpp
+++ b/src/multimedia/controls/qcamerafeedbackcontrol.cpp
@@ -44,6 +44,7 @@
 
 /*!
     \class QCameraFeedbackControl
+    \obsolete
 
     \brief The QCameraFeedbackControl class allows controlling feedback (sounds etc) during camera operation.
 
diff --git a/src/multimedia/controls/qcameraflashcontrol.cpp b/src/multimedia/controls/qcameraflashcontrol.cpp
index d5d9b564f..658e2d56c 100644
--- a/src/multimedia/controls/qcameraflashcontrol.cpp
+++ b/src/multimedia/controls/qcameraflashcontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraFlashControl
+    \obsolete
 
     \brief The QCameraFlashControl class allows controlling a camera's flash.
 
diff --git a/src/multimedia/controls/qcamerafocuscontrol.cpp b/src/multimedia/controls/qcamerafocuscontrol.cpp
index d963c95d4..b216882b4 100644
--- a/src/multimedia/controls/qcamerafocuscontrol.cpp
+++ b/src/multimedia/controls/qcamerafocuscontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraFocusControl
+    \obsolete
 
 
     \brief The QCameraFocusControl class supplies control for
diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp
index 3c110eb68..0e089d01b 100644
--- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp
+++ b/src/multimedia/controls/qcameraimagecapturecontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraImageCaptureControl
+    \obsolete
 
     \brief The QCameraImageCaptureControl class provides a control interface
     for image capture services.
diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp
index a39846642..fba4bf400 100644
--- a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp
+++ b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp
@@ -51,6 +51,7 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterCameraImageProcessingControlMetaTypes)
 
 /*!
     \class QCameraImageProcessingControl
+    \obsolete
     \inmodule QtMultimedia
 
 
diff --git a/src/multimedia/controls/qcamerainfocontrol.cpp b/src/multimedia/controls/qcamerainfocontrol.cpp
index de6dc4277..8a4ef3b44 100644
--- a/src/multimedia/controls/qcamerainfocontrol.cpp
+++ b/src/multimedia/controls/qcamerainfocontrol.cpp
@@ -43,6 +43,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraInfoControl
+    \obsolete
     \since 5.3
 
     \brief The QCameraInfoControl class provides a camera info media control.
diff --git a/src/multimedia/controls/qcameralockscontrol.cpp b/src/multimedia/controls/qcameralockscontrol.cpp
index 436b3b9c9..27b68cf2c 100644
--- a/src/multimedia/controls/qcameralockscontrol.cpp
+++ b/src/multimedia/controls/qcameralockscontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraLocksControl
+    \obsolete
 
 
 
diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp
index 6fa0ded82..bd5c7a73b 100644
--- a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp
+++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraViewfinderSettingsControl
+    \obsolete
     \inmodule QtMultimedia
 
 
diff --git a/src/multimedia/controls/qcamerazoomcontrol.cpp b/src/multimedia/controls/qcamerazoomcontrol.cpp
index 9c8d8d289..1f0835224 100644
--- a/src/multimedia/controls/qcamerazoomcontrol.cpp
+++ b/src/multimedia/controls/qcamerazoomcontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraZoomControl
+    \obsolete
 
 
     \brief The QCameraZoomControl class supplies control for
diff --git a/src/multimedia/controls/qcustomaudiorolecontrol.cpp b/src/multimedia/controls/qcustomaudiorolecontrol.cpp
index 046219687..f1b89eda5 100644
--- a/src/multimedia/controls/qcustomaudiorolecontrol.cpp
+++ b/src/multimedia/controls/qcustomaudiorolecontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCustomAudioRoleControl
+    \obsolete
     \inmodule QtMultimedia
     \ingroup multimedia_control
     \since 5.11
diff --git a/src/multimedia/controls/qimageencodercontrol.cpp b/src/multimedia/controls/qimageencodercontrol.cpp
index c29a61662..6223c33c7 100644
--- a/src/multimedia/controls/qimageencodercontrol.cpp
+++ b/src/multimedia/controls/qimageencodercontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QImageEncoderControl
+    \obsolete
 
     \inmodule QtMultimedia
 
diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.cpp b/src/multimedia/controls/qmediaaudioprobecontrol.cpp
index 296f01888..e22135903 100644
--- a/src/multimedia/controls/qmediaaudioprobecontrol.cpp
+++ b/src/multimedia/controls/qmediaaudioprobecontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaAudioProbeControl
+    \obsolete
     \inmodule QtMultimedia
 
 
diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.cpp b/src/multimedia/controls/qmediaavailabilitycontrol.cpp
index 1a6d73a8a..68b404369 100644
--- a/src/multimedia/controls/qmediaavailabilitycontrol.cpp
+++ b/src/multimedia/controls/qmediaavailabilitycontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaAvailabilityControl
+    \obsolete
 
     \brief The QMediaAvailabilityControl class supplies a control for reporting availability of a service.
 
diff --git a/src/multimedia/controls/qmediacontainercontrol.cpp b/src/multimedia/controls/qmediacontainercontrol.cpp
index b15c8acdc..2b2c8b78b 100644
--- a/src/multimedia/controls/qmediacontainercontrol.cpp
+++ b/src/multimedia/controls/qmediacontainercontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaContainerControl
+    \obsolete
 
     \brief The QMediaContainerControl class provides access to the output container format of a QMediaService.
 
diff --git a/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp b/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp
index b76274972..c9f531454 100644
--- a/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp
+++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp
@@ -42,6 +42,7 @@
 
 /*!
     \class QMediaGaplessPlaybackControl
+    \obsolete
     \inmodule QtMultimedia
 
 
diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp
index 9e9ad239d..07714da62 100644
--- a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp
+++ b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp
@@ -43,6 +43,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaNetworkAccessControl
+    \obsolete
     \brief The QMediaNetworkAccessControl class allows the setting of the Network Access Point for media related activities.
     \inmodule QtMultimedia
 
diff --git a/src/multimedia/controls/qmediaplayercontrol.cpp b/src/multimedia/controls/qmediaplayercontrol.cpp
index 28b217af8..a180413b9 100644
--- a/src/multimedia/controls/qmediaplayercontrol.cpp
+++ b/src/multimedia/controls/qmediaplayercontrol.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaPlayerControl
+    \obsolete
     \inmodule QtMultimedia
 
 
diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp
index f078073ef..87ace7017 100644
--- a/src/multimedia/controls/qmediarecordercontrol.cpp
+++ b/src/multimedia/controls/qmediarecordercontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaRecorderControl
+    \obsolete
     \inmodule QtMultimedia
 
 
diff --git a/src/multimedia/controls/qmediastreamscontrol.cpp b/src/multimedia/controls/qmediastreamscontrol.cpp
index aa5fe007d..2db9eb6fc 100644
--- a/src/multimedia/controls/qmediastreamscontrol.cpp
+++ b/src/multimedia/controls/qmediastreamscontrol.cpp
@@ -52,6 +52,7 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterMediaStreamControlMetaTypes)
 
 /*!
     \class QMediaStreamsControl
+    \obsolete
     \inmodule QtMultimedia
 
 
diff --git a/src/multimedia/controls/qmediavideoprobecontrol.cpp b/src/multimedia/controls/qmediavideoprobecontrol.cpp
index ea27ab057..4a85d56d0 100644
--- a/src/multimedia/controls/qmediavideoprobecontrol.cpp
+++ b/src/multimedia/controls/qmediavideoprobecontrol.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaVideoProbeControl
+    \obsolete
     \inmodule QtMultimedia
 
 
diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp
index e728353f6..f01ffec38 100644
--- a/src/multimedia/controls/qmetadatareadercontrol.cpp
+++ b/src/multimedia/controls/qmetadatareadercontrol.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMetaDataReaderControl
+    \obsolete
     \inmodule QtMultimedia
 
 
diff --git a/src/multimedia/controls/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp
index 053597b88..6221edaa1 100644
--- a/src/multimedia/controls/qmetadatawritercontrol.cpp
+++ b/src/multimedia/controls/qmetadatawritercontrol.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMetaDataWriterControl
+    \obsolete
     \inmodule QtMultimedia
 
 
diff --git a/src/multimedia/controls/qradiodatacontrol.cpp b/src/multimedia/controls/qradiodatacontrol.cpp
index df0046b5e..27e192674 100644
--- a/src/multimedia/controls/qradiodatacontrol.cpp
+++ b/src/multimedia/controls/qradiodatacontrol.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QRadioDataControl
+    \obsolete
     \inmodule QtMultimedia
 
 
diff --git a/src/multimedia/controls/qradiotunercontrol.cpp b/src/multimedia/controls/qradiotunercontrol.cpp
index ea2126319..20897150b 100644
--- a/src/multimedia/controls/qradiotunercontrol.cpp
+++ b/src/multimedia/controls/qradiotunercontrol.cpp
@@ -46,9 +46,9 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QRadioTunerControl
+    \obsolete
     \inmodule QtMultimedia
 
-
     \ingroup multimedia_control
 
 
diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.cpp b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp
index 8c4ee7ba4..420ba9150 100644
--- a/src/multimedia/controls/qvideodeviceselectorcontrol.cpp
+++ b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp
@@ -43,6 +43,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoDeviceSelectorControl
+    \obsolete
 
     \brief The QVideoDeviceSelectorControl class provides an video device selector media control.
     \inmodule QtMultimedia
diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.cpp b/src/multimedia/controls/qvideoencodersettingscontrol.cpp
index 52ae51382..64643f6db 100644
--- a/src/multimedia/controls/qvideoencodersettingscontrol.cpp
+++ b/src/multimedia/controls/qvideoencodersettingscontrol.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoEncoderSettingsControl
+    \obsolete
 
     \inmodule QtMultimedia
 
diff --git a/src/multimedia/controls/qvideorenderercontrol.cpp b/src/multimedia/controls/qvideorenderercontrol.cpp
index e722dfa38..eee20d59e 100644
--- a/src/multimedia/controls/qvideorenderercontrol.cpp
+++ b/src/multimedia/controls/qvideorenderercontrol.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoRendererControl
+    \obsolete
 
     \inmodule QtMultimedia
     \brief The QVideoRendererControl class provides a media control for rendering video to a QAbstractVideoSurface.
diff --git a/src/multimedia/controls/qvideowindowcontrol.cpp b/src/multimedia/controls/qvideowindowcontrol.cpp
index e971a6925..a6b2bf407 100644
--- a/src/multimedia/controls/qvideowindowcontrol.cpp
+++ b/src/multimedia/controls/qvideowindowcontrol.cpp
@@ -43,6 +43,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoWindowControl
+    \obsolete
 
     \inmodule QtMultimedia
 
-- 
cgit v1.2.3