diff options
| author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-08-23 14:50:30 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-09-21 22:31:57 +0200 |
| commit | fdf2f673701fec9c3b99ad5e602d771c0b5ab9c9 (patch) | |
| tree | 2ebddfb7c4717039e44edfa44021b32eecbe1258 | |
| parent | 43cd99e688860112aa0dce06e1adb7bde4a06edc (diff) | |
| download | qtmultimedia-fdf2f673701fec9c3b99ad5e602d771c0b5ab9c9.tar.gz | |
Fix deprecation condition for QMediaResource
Decided to update only docs that the class is obsolete.
QT_DEPRECATED_SINCE is not needed.
Also due to deprecation warnings (produced e.g. by Q_DECLARE_METATYPE),
QT_DEPRECATED_X is not used.
NOTE, QMediaResource will be removed from Qt 6
Change-Id: I24c6b58f90315880839dd137cab3108809a63760
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| -rw-r--r-- | src/multimedia/playback/qmediaresource.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/playback/qmediaresource.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/multimedia/playback/qmediaresource.cpp b/src/multimedia/playback/qmediaresource.cpp index 181b37525..97d42bd0b 100644 --- a/src/multimedia/playback/qmediaresource.cpp +++ b/src/multimedia/playback/qmediaresource.cpp @@ -39,8 +39,6 @@ #include "qmediaresource.h" -#if QT_DEPRECATED_SINCE(6, 0) - #include <QtCore/qsize.h> #include <QtCore/qurl.h> #include <QtCore/qvariant.h> @@ -420,5 +418,3 @@ void QMediaResource::setResolution(int width, int height) values.remove(Resolution); } QT_END_NAMESPACE - -#endif // #if QT_DEPRECATED_SINCE(6, 0) diff --git a/src/multimedia/playback/qmediaresource.h b/src/multimedia/playback/qmediaresource.h index 8cded3128..9740166c6 100644 --- a/src/multimedia/playback/qmediaresource.h +++ b/src/multimedia/playback/qmediaresource.h @@ -46,8 +46,6 @@ #include <QtMultimedia/qtmultimediaglobal.h> -#if QT_DEPRECATED_SINCE(6, 0) - QT_BEGIN_NAMESPACE // Class forward declaration required for QDoc bug @@ -126,6 +124,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QMediaResource) Q_DECLARE_METATYPE(QMediaResourceList) -#endif // #if QT_DEPRECATED_SINCE(6, 0) - #endif |