From 8017e4a1c00a129864a34bf15562c4a38a7f9716 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 22 Mar 2019 13:21:54 +0100 Subject: Fix type of the out parameter "result" of the native event filters Task-number: QTBUG-72968 Change-Id: I31da3bd3e8a775243b94e02e3659e2d00e46b9b6 Reviewed-by: Volker Hilsheimer Reviewed-by: Oliver Wolff Reviewed-by: VaL Doroshchuk --- src/multimediawidgets/qvideowidget.cpp | 4 ++++ src/multimediawidgets/qvideowidget.h | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'src/multimediawidgets') diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp index 7d26a8534..991901097 100644 --- a/src/multimediawidgets/qvideowidget.cpp +++ b/src/multimediawidgets/qvideowidget.cpp @@ -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: -- cgit v1.2.3