diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 18:48:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:50:30 +0000 |
| commit | 38e49d060d13ef592f457a5d6640d68a2d9c6b06 (patch) | |
| tree | b6fccceb55f338a8c53e31afb88a4fce965d305b /src/multimediawidgets/qgraphicsvideoitem.cpp | |
| parent | c9058d90d0b08781f14a494780c3094594c81f22 (diff) | |
| parent | 324471ef9054911422f8f2d40a243c67b501c8f0 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/multimediawidgets/qgraphicsvideoitem.cpp')
| -rw-r--r-- | src/multimediawidgets/qgraphicsvideoitem.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimediawidgets/qgraphicsvideoitem.cpp b/src/multimediawidgets/qgraphicsvideoitem.cpp index 38f5c0e5b..2db8987fb 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.cpp +++ b/src/multimediawidgets/qgraphicsvideoitem.cpp @@ -415,5 +415,6 @@ void QGraphicsVideoItem::timerEvent(QTimerEvent *event) QGraphicsObject::timerEvent(event); } -#include "moc_qgraphicsvideoitem.cpp" QT_END_NAMESPACE + +#include "moc_qgraphicsvideoitem.cpp" |