diff options
Diffstat (limited to 'src/multimediawidgets')
-rw-r--r-- | src/multimediawidgets/qgraphicsvideoitem.h | 2 | ||||
-rw-r--r-- | src/multimediawidgets/qvideowidget.cpp | 4 | ||||
-rw-r--r-- | src/multimediawidgets/qvideowidget.h | 4 |
3 files changed, 0 insertions, 10 deletions
diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h index 5c71ee651..621a9852f 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.h +++ b/src/multimediawidgets/qgraphicsvideoitem.h @@ -83,14 +83,12 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) enum { Type = 14 }; int type() const override { // Enable the use of qgraphicsitem_cast with this item. return Type; } -#endif Q_SIGNALS: void nativeSizeChanged(const QSizeF &size); diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp index 5158b2f35..bab1ffbff 100644 --- a/src/multimediawidgets/qvideowidget.cpp +++ b/src/multimediawidgets/qvideowidget.cpp @@ -1034,11 +1034,7 @@ 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 fdf93330b..cabe5e840 100644 --- a/src/multimediawidgets/qvideowidget.h +++ b/src/multimediawidgets/qvideowidget.h @@ -85,11 +85,7 @@ 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: |