5 files changed, 19 insertions, 17 deletions
diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h
index f8eb68fbf..a1dc96701 100644
--- a/src/multimedia/camera/qcameraexposure.h
+++ b/src/multimedia/camera/qcameraexposure.h
@@ -165,11 +165,13 @@ Q_SIGNALS:
     void isoSensitivityChanged(int);
     void exposureCompensationChanged(qreal);
 
+protected:
+    virtual ~QCameraExposure();
+
 private:
     friend class QCamera;
     friend class QCameraPrivate;
     explicit QCameraExposure(QCamera *parent = nullptr);
-    virtual ~QCameraExposure();
 
     Q_DISABLE_COPY(QCameraExposure)
     Q_DECLARE_PRIVATE(QCameraExposure)
diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp
index 33e280205..980b9dc93 100644
--- a/src/multimedia/camera/qcamerafocus.cpp
+++ b/src/multimedia/camera/qcamerafocus.cpp
@@ -325,8 +325,6 @@ class QCameraFocusPrivate : public QMediaObjectPrivate
 public:
     void initControls();
 
-    QCameraFocus *q_ptr;
-
     QCamera *camera;
 
     QCameraFocusControl *focusControl;
@@ -373,12 +371,11 @@ void QCameraFocusPrivate::initControls()
     Construct a QCameraFocus for \a camera.
 */
 
-QCameraFocus::QCameraFocus(QCamera *camera):
-    QObject(camera), d_ptr(new QCameraFocusPrivate)
+QCameraFocus::QCameraFocus(QCamera *camera)
+    : QObject(*new QCameraFocusPrivate, camera)
 {
     Q_D(QCameraFocus);
     d->camera = camera;
-    d->q_ptr = this;
     d->initControls();
 }
 
@@ -389,7 +386,6 @@ QCameraFocus::QCameraFocus(QCamera *camera):
 
 QCameraFocus::~QCameraFocus()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h
index 31d056de9..a5d7725e3 100644
--- a/src/multimedia/camera/qcamerafocus.h
+++ b/src/multimedia/camera/qcamerafocus.h
@@ -152,15 +152,19 @@ Q_SIGNALS:
     void maximumOpticalZoomChanged(qreal);
     void maximumDigitalZoomChanged(qreal);
 
+protected:
+    ~QCameraFocus();
+
 private:
     friend class QCamera;
     friend class QCameraPrivate;
     QCameraFocus(QCamera *camera);
-    ~QCameraFocus();
 
     Q_DISABLE_COPY(QCameraFocus)
     Q_DECLARE_PRIVATE(QCameraFocus)
-    QCameraFocusPrivate *d_ptr;
+#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.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp
index 27b7f05bd..af6c22391 100644
--- a/src/multimedia/camera/qcameraimageprocessing.cpp
+++ b/src/multimedia/camera/qcameraimageprocessing.cpp
@@ -114,8 +114,6 @@ class QCameraImageProcessingPrivate : public QMediaObjectPrivate
 public:
     void initControls();
 
-    QCameraImageProcessing *q_ptr;
-
     QCamera *camera;
     QCameraImageProcessingControl *imageControl;
     bool available;
@@ -140,12 +138,11 @@ void QCameraImageProcessingPrivate::initControls()
     Construct a QCameraImageProcessing for \a camera.
 */
 
-QCameraImageProcessing::QCameraImageProcessing(QCamera *camera):
-    QObject(camera), d_ptr(new QCameraImageProcessingPrivate)
+QCameraImageProcessing::QCameraImageProcessing(QCamera *camera)
+    : QObject(*new QCameraImageProcessingPrivate, camera)
 {
     Q_D(QCameraImageProcessing);
     d->camera = camera;
-    d->q_ptr = this;
     d->initControls();
 }
 
@@ -156,7 +153,6 @@ QCameraImageProcessing::QCameraImageProcessing(QCamera *camera):
 
 QCameraImageProcessing::~QCameraImageProcessing()
 {
-    delete d_ptr;
 }
 
 
diff --git a/src/multimedia/camera/qcameraimageprocessing.h b/src/multimedia/camera/qcameraimageprocessing.h
index 3eb7c8569..f76daf85e 100644
--- a/src/multimedia/camera/qcameraimageprocessing.h
+++ b/src/multimedia/camera/qcameraimageprocessing.h
@@ -116,15 +116,19 @@ public:
     void setColorFilter(ColorFilter filter);
     bool isColorFilterSupported(ColorFilter filter) const;
 
+protected:
+    ~QCameraImageProcessing();
+
 private:
     friend class QCamera;
     friend class QCameraPrivate;
     QCameraImageProcessing(QCamera *camera);
-    ~QCameraImageProcessing();
 
     Q_DISABLE_COPY(QCameraImageProcessing)
     Q_DECLARE_PRIVATE(QCameraImageProcessing)
-    QCameraImageProcessingPrivate *d_ptr;
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    QCameraImageProcessingPrivate *d_ptr_deprecated;
+#endif
 };
 
 QT_END_NAMESPACE