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:11 +0000 |
| commit | 324471ef9054911422f8f2d40a243c67b501c8f0 (patch) | |
| tree | b6fccceb55f338a8c53e31afb88a4fce965d305b /src/multimedia/qmediaobject.cpp | |
| parent | c9058d90d0b08781f14a494780c3094594c81f22 (diff) | |
| parent | a1bf811b1dd287fbb75b6d27dbc163f15001e28f (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/gsttools/qgstvideorenderersink.cpp
src/gsttools/qgstvideorenderersink_p.h
Change-Id: I7fe29161d568fa3f7688abfd2f993d1b16ac3fb9
Diffstat (limited to 'src/multimedia/qmediaobject.cpp')
| -rw-r--r-- | src/multimedia/qmediaobject.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp index b5fc3273b..a26433c8e 100644 --- a/src/multimedia/qmediaobject.cpp +++ b/src/multimedia/qmediaobject.cpp @@ -422,7 +422,6 @@ void QMediaObject::setupControls() Signal emitted when the availability of the service has changed to \a availability. */ - -#include "moc_qmediaobject.cpp" QT_END_NAMESPACE +#include "moc_qmediaobject.cpp" |