diff options
Diffstat (limited to 'src/multimediawidgets')
-rw-r--r-- | src/multimediawidgets/qvideowidget.cpp | 6 | ||||
-rw-r--r-- | src/multimediawidgets/qvideowidget.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp index bae0efd22..a7d3665f8 100644 --- a/src/multimediawidgets/qvideowidget.cpp +++ b/src/multimediawidgets/qvideowidget.cpp @@ -77,7 +77,7 @@ QVideoWidgetControlBackend::QVideoWidgetControlBackend( connect(control, SIGNAL(fullScreenChanged(bool)), widget, SLOT(_q_fullScreenChanged(bool))); QBoxLayout *layout = new QVBoxLayout; - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(0); QWidget *videoWidget = control->videoWidget(); @@ -1007,7 +1007,11 @@ void QVideoWidget::paintEvent(QPaintEvent *event) } #if defined(Q_OS_WIN) +# if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool QVideoWidget::nativeEvent(const QByteArray &eventType, void *message, qintptr *result) +# else bool QVideoWidget::nativeEvent(const QByteArray &eventType, void *message, long *result) +# endif { Q_D(QVideoWidget); Q_UNUSED(eventType); diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h index 2a08b6fbd..fff1153ca 100644 --- a/src/multimediawidgets/qvideowidget.h +++ b/src/multimediawidgets/qvideowidget.h @@ -82,7 +82,11 @@ public: QSize sizeHint() const override; #if defined(Q_OS_WIN) +# if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override; +# else bool nativeEvent(const QByteArray &eventType, void *message, long *result) override; +# endif #endif public Q_SLOTS: |