Remove code for < QT_VERSION_CHECK(6, 0, 0)

Change-Id: Ia64872eef299b2583a21ea40403cb0d281baf3e6
Reviewed-by: Liang Qi <liang.qi@qt.io>

6 files changed, 0 insertions, 34 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;