diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-02-12 17:41:47 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-03-02 14:48:11 +0000 |
| commit | d6f5e27b380546654406e8469ad1083fe1350479 (patch) | |
| tree | a13445bda3be8dc3b9a230864e04a81e816217b0 /src/imports | |
| parent | d8749dbea84bfa28bfcb5cdb60550f3e5cac3b7e (diff) | |
Rename QMediaPlayerControl to QPlatformMediaPlayer
This is the start of a larger renaming excercise, that
will hopefully bring us closer towards a final naming
convention for files and classes in the multimedia
backends.
Change-Id: Ib6010e2923cbf82b6bd6cd247614b4405863cf70
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativeaudio_p.h | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qmldir | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index 49dfb0b73..2668cd3fd 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -40,7 +40,7 @@ #include "qdeclarativeaudio_p.h" -#include <qmediaplayercontrol.h> +#include <private/qplatformmediaplayer_p.h> #include <private/qdeclarativevideooutput_p.h> diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h index ebae60324..e85105d44 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p.h +++ b/src/imports/multimedia/qdeclarativeaudio_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE class QTimerEvent; -class QMediaPlayerControl; +class QPlatformMediaPlayer; class QDeclarativeMediaBaseAnimation; class QDeclarativeMediaMetaData; diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 6536bc5dc..41320edcf 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -48,7 +48,7 @@ #include "qdeclarativemediametadata_p.h" -#include <qmediaplayercontrol.h> +#include <private/qplatformmediaplayer_p.h> #include <qvideorenderercontrol.h> #include <QMediaDeviceManager> #include <QtQml/qqmlinfo.h> diff --git a/src/imports/multimedia/qmldir b/src/imports/multimedia/qmldir index d68049f63..e7dcc3dd6 100644 --- a/src/imports/multimedia/qmldir +++ b/src/imports/multimedia/qmldir @@ -4,3 +4,4 @@ classname QMultimediaDeclarativeModule typeinfo plugins.qmltypes typeinfo plugins.qmltypes Video 5.0 Video.qml + |