diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-01-05 09:32:38 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-22 06:59:28 +0000 |
| commit | 3585c53dc8977198cd08aa01d554cde0e201dd48 (patch) | |
| tree | 870d4f2b718ef2554c38d7ca56536069407d5ac7 /src/multimedia/playback/qmediaplayer.h | |
| parent | 5c281da180e86cf1d60e41f124568441f7a0634e (diff) | |
Rename QMediaObject to QMediaSource
That actually describes what those classes are.
Change-Id: I9ce01707bb260ff6452359e211f2c22b5740e61b
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/playback/qmediaplayer.h')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 66a60b508..4674f98bf 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -41,7 +41,7 @@ #define QMEDIAPLAYER_H #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qmediacontent.h> #include <QtMultimedia/qmediaenumdebug.h> #include <QtMultimedia/qaudio.h> @@ -55,7 +55,7 @@ class QVideoWidget; class QGraphicsVideoItem; class QMediaPlayerPrivate; -class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QMediaObject +class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QMediaSource { Q_OBJECT Q_PROPERTY(QMediaContent media READ media WRITE setMedia NOTIFY mediaChanged) |