diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-02-12 11:44:25 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-02-17 08:28:00 +0000 |
| commit | 762eff8c15aa8cbb6962c2893ff792ab172783ee (patch) | |
| tree | ab8522cbf35d07aaa3bd1bae84aa894ffd9a0df7 /src/imports | |
| parent | 33186a09048faef5b9a6585b69e0a9cab4182a3e (diff) | |
And finally kill QMediaService
This removes the past piece of the old service architecture
from Qt Multimedia.
Change-Id: I607f82a546b2a2e29024b987fed3ba6e3645ae48
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/qdeclarativemediametadata_p.h | 1 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativetorch.cpp | 1 | ||||
| -rw-r--r-- | src/imports/multimedia/qmldir | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h index 3c5313b04..f08c14c68 100644 --- a/src/imports/multimedia/qdeclarativemediametadata_p.h +++ b/src/imports/multimedia/qdeclarativemediametadata_p.h @@ -53,7 +53,6 @@ #include <QtQml/qqml.h> #include <QtMultimedia/qmediametadata.h> -#include <QtMultimedia/qmediaservice.h> #include "qmediametadata.h" QT_BEGIN_NAMESPACE diff --git a/src/imports/multimedia/qdeclarativetorch.cpp b/src/imports/multimedia/qdeclarativetorch.cpp index c544c0a4e..21c594e72 100644 --- a/src/imports/multimedia/qdeclarativetorch.cpp +++ b/src/imports/multimedia/qdeclarativetorch.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include <QDebug> -#include <QMediaService> #include <private/qmediaplatformcaptureinterface_p.h> #include <qcameracontrol.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 + |