From 97177277a2fcca974d7599ab8ea12ad80ab30efc Mon Sep 17 00:00:00 2001 From: Val Doroshchuk Date: Mon, 2 Sep 2019 14:37:39 +0200 Subject: Include moc files after QT_END_NAMESPACE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTBUG-76574 Change-Id: I69ef47bbd01967c3d7a0c5d1554fcdd29619ebfa Reviewed-by: Christian Strømme --- src/multimediawidgets/qgraphicsvideoitem.cpp | 3 ++- src/multimediawidgets/qpaintervideosurface.cpp | 3 +-- src/multimediawidgets/qvideowidget.cpp | 4 ++-- src/multimediawidgets/qvideowidgetcontrol.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/multimediawidgets') 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" diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index 6af0c7588..944ea23a7 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -1761,7 +1761,6 @@ void QPainterVideoSurface::createPainter() #endif } -#include "moc_qpaintervideosurface_p.cpp" QT_END_NAMESPACE - +#include "moc_qpaintervideosurface_p.cpp" diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp index 7d26a8534..bae0efd22 100644 --- a/src/multimediawidgets/qvideowidget.cpp +++ b/src/multimediawidgets/qvideowidget.cpp @@ -1023,7 +1023,7 @@ bool QVideoWidget::nativeEvent(const QByteArray &eventType, void *message, long } #endif -#include "moc_qvideowidget.cpp" -#include "moc_qvideowidget_p.cpp" QT_END_NAMESPACE +#include "moc_qvideowidget.cpp" +#include "moc_qvideowidget_p.cpp" diff --git a/src/multimediawidgets/qvideowidgetcontrol.cpp b/src/multimediawidgets/qvideowidgetcontrol.cpp index a71500dbd..7f72c620e 100644 --- a/src/multimediawidgets/qvideowidgetcontrol.cpp +++ b/src/multimediawidgets/qvideowidgetcontrol.cpp @@ -219,6 +219,6 @@ QVideoWidgetControl::~QVideoWidgetControl() Returns the QWidget. */ -#include "moc_qvideowidgetcontrol.cpp" QT_END_NAMESPACE +#include "moc_qvideowidgetcontrol.cpp" -- cgit v1.2.3