diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:06:24 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:06:31 +0200 |
| commit | cf73d52defa8f37f122c527f73e830ebb4046b4a (patch) | |
| tree | a3594868bba2619613b09e14be5b66063ec4f188 /src/multimedia/controls/qvideorenderercontrol.cpp | |
| parent | 18e6110dfdfd62cc0032f8e43586d075f15299f0 (diff) | |
| parent | e329e1d7cb8e88a490eb5f50453c82444836afaf (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/multimedia/controls/qvideorenderercontrol.cpp')
| -rw-r--r-- | src/multimedia/controls/qvideorenderercontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/controls/qvideorenderercontrol.cpp b/src/multimedia/controls/qvideorenderercontrol.cpp index 92973e5f8..e722dfa38 100644 --- a/src/multimedia/controls/qvideorenderercontrol.cpp +++ b/src/multimedia/controls/qvideorenderercontrol.cpp @@ -103,6 +103,6 @@ QVideoRendererControl::~QVideoRendererControl() Sets the \a surface a video producer renders to. */ -#include "moc_qvideorenderercontrol.cpp" QT_END_NAMESPACE +#include "moc_qvideorenderercontrol.cpp" |