diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-08 03:03:45 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-10-08 07:29:42 +0000 |
| commit | 1cb8dcaa90ab5b7e05cced20772caade74f0461b (patch) | |
| tree | 3a7536e366362952169ca78b03139c925c80c95b /src/multimediawidgets | |
| parent | fa4d01ae128dd5605910bafda580e856239e36c6 (diff) | |
| parent | d2475bdd4cbb9a70abf19db465ddbdbf29591568 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/multimedia/configure.json
Change-Id: Ie887a5f4d718cb3e082b0e2ee996c6687af330cb
Diffstat (limited to 'src/multimediawidgets')
| -rw-r--r-- | src/multimediawidgets/qgraphicsvideoitem.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h index 3902389d9..5aa3bd75c 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.h +++ b/src/multimediawidgets/qgraphicsvideoitem.h @@ -81,6 +81,15 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + enum { Type = 14 }; + int type() const override + { + // Enable the use of qgraphicsitem_cast with this item. + return Type; + } +#endif + Q_SIGNALS: void nativeSizeChanged(const QSizeF &size); |