15 files changed, 0 insertions, 68 deletions
diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h
index a5d7725e3..11639c3da 100644
--- a/src/multimedia/camera/qcamerafocus.h
+++ b/src/multimedia/camera/qcamerafocus.h
@@ -162,9 +162,6 @@ private:
 
     Q_DISABLE_COPY(QCameraFocus)
     Q_DECLARE_PRIVATE(QCameraFocus)
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    QCameraFocusPrivate *d_ptr_deprecated;
-#endif
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QCameraFocus::FocusModes)
diff --git a/src/multimedia/camera/qcameraimageprocessing.h b/src/multimedia/camera/qcameraimageprocessing.h
index f76daf85e..ddb94f70a 100644
--- a/src/multimedia/camera/qcameraimageprocessing.h
+++ b/src/multimedia/camera/qcameraimageprocessing.h
@@ -126,9 +126,6 @@ private:
 
     Q_DISABLE_COPY(QCameraImageProcessing)
     Q_DECLARE_PRIVATE(QCameraImageProcessing)
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    QCameraImageProcessingPrivate *d_ptr_deprecated;
-#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/qmediaobject.h b/src/multimedia/qmediaobject.h
index fabd015fe..7c8da9555 100644
--- a/src/multimedia/qmediaobject.h
+++ b/src/multimedia/qmediaobject.h
@@ -93,10 +93,6 @@ protected:
     void addPropertyWatch(QByteArray const &name);
     void removePropertyWatch(QByteArray const &name);
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    QMediaObjectPrivate *d_ptr_deprecated;
-#endif
-
 private:
     void setupControls();
 
diff --git a/src/multimedia/qmediaservice.h b/src/multimedia/qmediaservice.h
index 019b86693..f3e38630c 100644
--- a/src/multimedia/qmediaservice.h
+++ b/src/multimedia/qmediaservice.h
@@ -74,10 +74,6 @@ protected:
     QMediaService(QObject* parent);
     QMediaService(QMediaServicePrivate &dd, QObject *parent);
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    QMediaServicePrivate *d_ptr_deprecated;
-#endif
-
 private:
     Q_DECLARE_PRIVATE(QMediaService)
 };
diff --git a/src/multimedia/qmediatimerange.cpp b/src/multimedia/qmediatimerange.cpp
index 3a22e000f..913790a0e 100644
--- a/src/multimedia/qmediatimerange.cpp
+++ b/src/multimedia/qmediatimerange.cpp
@@ -94,20 +94,6 @@ QMediaTimeInterval::QMediaTimeInterval(qint64 start, qint64 end)
 
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-/*!
-    \fn QMediaTimeInterval::QMediaTimeInterval(const QMediaTimeInterval &other)
-
-    Constructs an interval by taking a copy of \a other.
-*/
-QMediaTimeInterval::QMediaTimeInterval(const QMediaTimeInterval &other)
-    : s(other.s)
-    , e(other.e)
-{
-
-}
-#endif
-
 /*!
     \fn QMediaTimeInterval::start() const
 
diff --git a/src/multimedia/qmediatimerange.h b/src/multimedia/qmediatimerange.h
index 71145adde..97524f24a 100644
--- a/src/multimedia/qmediatimerange.h
+++ b/src/multimedia/qmediatimerange.h
@@ -54,12 +54,6 @@ class Q_MULTIMEDIA_EXPORT QMediaTimeInterval
 public:
     QMediaTimeInterval();
     QMediaTimeInterval(qint64 start, qint64 end);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    QMediaTimeInterval(const QMediaTimeInterval&);
-    QMediaTimeInterval &operator=(const QMediaTimeInterval&) = default;
-    QMediaTimeInterval(QMediaTimeInterval &&) = default;
-    QMediaTimeInterval &operator=(QMediaTimeInterval &&) = default;
-#endif
 
     qint64 start() const;
     qint64 end() const;
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:
diff --git a/src/plugins/qnx/camera/bbcameraorientationhandler.cpp b/src/plugins/qnx/camera/bbcameraorientationhandler.cpp
index a4c7b43ba..d600f3db0 100644
--- a/src/plugins/qnx/camera/bbcameraorientationhandler.cpp
+++ b/src/plugins/qnx/camera/bbcameraorientationhandler.cpp
@@ -76,11 +76,7 @@ BbCameraOrientationHandler::~BbCameraOrientationHandler()
     QCoreApplication::eventDispatcher()->removeNativeEventFilter(this);
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 bool BbCameraOrientationHandler::nativeEventFilter(const QByteArray&, void *message, qintptr *)
-#else
-bool BbCameraOrientationHandler::nativeEventFilter(const QByteArray&, void *message, long *)
-#endif
 {
     bps_event_t* const event = static_cast<bps_event_t*>(message);
     if (!event || bps_event_get_domain(event) != orientation_get_domain())
diff --git a/src/plugins/qnx/camera/bbcameraorientationhandler.h b/src/plugins/qnx/camera/bbcameraorientationhandler.h
index a98582d84..af80bd4e1 100644
--- a/src/plugins/qnx/camera/bbcameraorientationhandler.h
+++ b/src/plugins/qnx/camera/bbcameraorientationhandler.h
@@ -51,11 +51,7 @@ public:
     explicit BbCameraOrientationHandler(QObject *parent = 0);
     ~BbCameraOrientationHandler();
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
-#else
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
-#endif
 
     int orientation() const;
 
diff --git a/src/plugins/qnx/common/windowgrabber.cpp b/src/plugins/qnx/common/windowgrabber.cpp
index f431f98a2..65037fcce 100644
--- a/src/plugins/qnx/common/windowgrabber.cpp
+++ b/src/plugins/qnx/common/windowgrabber.cpp
@@ -189,11 +189,7 @@ bool WindowGrabber::handleScreenEvent(screen_event_t screen_event)
     return false;
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 bool WindowGrabber::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *)
-#else
-bool WindowGrabber::nativeEventFilter(const QByteArray &eventType, void *message, long *)
-#endif
 {
     if (eventType == "screen_event_t") {
         const screen_event_t event = static_cast<screen_event_t>(message);
diff --git a/src/plugins/qnx/common/windowgrabber.h b/src/plugins/qnx/common/windowgrabber.h
index 5603d9634..c4c1f6a53 100644
--- a/src/plugins/qnx/common/windowgrabber.h
+++ b/src/plugins/qnx/common/windowgrabber.h
@@ -100,11 +100,7 @@ public:
     void pause();
     void resume();
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
-#else
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
-#endif
 
     bool handleScreenEvent(screen_event_t event);
 
diff --git a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
index aff0bae51..b5c9804ab 100644
--- a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
+++ b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
@@ -113,11 +113,7 @@ void MmrEventMediaPlayerControl::resetMonitoring()
     m_speed = 0;
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 bool MmrEventMediaPlayerControl::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result)
-#else
-bool MmrEventMediaPlayerControl::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
-#endif
 {
     Q_UNUSED(result);
     if (eventType == "screen_event_t") {
diff --git a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h
index cb80ccbfc..e6c138f89 100644
--- a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h
+++ b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h
@@ -58,11 +58,7 @@ public:
     void stopMonitoring() override;
     void resetMonitoring() override;
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
-#else
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
-#endif
 
 private Q_SLOTS:
     void readEvents();