diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-05 03:03:12 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-05 03:03:12 +0200 |
| commit | 0b76c9ebf09bcd518f582cd0b591c08d54440a58 (patch) | |
| tree | 6f5563d62e8529fee25d03aba9a036cb2a994f63 /src/multimedia/playback/qmediaresource.cpp | |
| parent | 6ce358e2b11fc8b160840a811bdced3643948a56 (diff) | |
| parent | b8382a4ac487c64a70796aa9d9016b5604ca9446 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I15cc30e1e075c7729da0aae2f8d053bf15456330
Diffstat (limited to 'src/multimedia/playback/qmediaresource.cpp')
| -rw-r--r-- | src/multimedia/playback/qmediaresource.cpp | 4 |
1 files changed, 0 insertions, 4 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) |