5 files changed, 14 insertions, 15 deletions
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index 828da2236..196b8ba84 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -102,7 +102,7 @@ void Camera::setCamera(const QCameraInfo &cameraInfo)
     m_mediaRecorder.reset(new QMediaRecorder(m_camera.data()));
     connect(m_mediaRecorder.data(), &QMediaRecorder::stateChanged, this, &Camera::updateRecorderState);
 
-    m_imageCapture.reset(new QCameraImageCapture(m_camera.data()));
+    m_imageCapture = new QCameraImageCapture(m_camera.data());
 
     connect(m_mediaRecorder.data(), &QMediaRecorder::durationChanged, this, &Camera::updateRecordTime);
     connect(m_mediaRecorder.data(), QOverload<QMediaRecorder::Error>::of(&QMediaRecorder::error),
@@ -118,10 +118,10 @@ void Camera::setCamera(const QCameraInfo &cameraInfo)
     updateLockStatus(m_camera->lockStatus(), QCamera::UserRequest);
     updateRecorderState(m_mediaRecorder->state());
 
-    connect(m_imageCapture.data(), &QCameraImageCapture::readyForCaptureChanged, this, &Camera::readyForCapture);
-    connect(m_imageCapture.data(), &QCameraImageCapture::imageCaptured, this, &Camera::processCapturedImage);
-    connect(m_imageCapture.data(), &QCameraImageCapture::imageSaved, this, &Camera::imageSaved);
-    connect(m_imageCapture.data(), QOverload<int, QCameraImageCapture::Error, const QString &>::of(&QCameraImageCapture::error),
+    connect(m_imageCapture, &QCameraImageCapture::readyForCaptureChanged, this, &Camera::readyForCapture);
+    connect(m_imageCapture, &QCameraImageCapture::imageCaptured, this, &Camera::processCapturedImage);
+    connect(m_imageCapture, &QCameraImageCapture::imageSaved, this, &Camera::imageSaved);
+    connect(m_imageCapture, QOverload<int, QCameraImageCapture::Error, const QString &>::of(&QCameraImageCapture::error),
             this, &Camera::displayCaptureError);
 
     connect(m_camera.data(), QOverload<QCamera::LockStatus, QCamera::LockChangeReason>::of(&QCamera::lockStatusChanged),
@@ -235,7 +235,7 @@ void Camera::configureVideoSettings()
 
 void Camera::configureImageSettings()
 {
-    ImageSettings settingsDialog(m_imageCapture.data());
+    ImageSettings settingsDialog(m_imageCapture);
     settingsDialog.setWindowFlags(settingsDialog.windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
     settingsDialog.setImageSettings(m_imageSettings);
diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index d06c770f6..bdef8b8f8 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -118,7 +118,7 @@ private:
     Ui::Camera *ui;
 
     QScopedPointer<QCamera> m_camera;
-    QScopedPointer<QCameraImageCapture> m_imageCapture;
+    QCameraImageCapture *m_imageCapture;
     QScopedPointer<QMediaRecorder> m_mediaRecorder;
 
     QImageEncoderSettings m_imageSettings;
diff --git a/src/multimedia/camera/qcamerainfo.cpp b/src/multimedia/camera/qcamerainfo.cpp
index 5f64def30..4946142c2 100644
--- a/src/multimedia/camera/qcamerainfo.cpp
+++ b/src/multimedia/camera/qcamerainfo.cpp
@@ -125,7 +125,7 @@ bool QCameraInfo::operator==(const QCameraInfo &other) const
 */
 bool QCameraInfo::isNull() const
 {
-    return d->isNull;
+    return !d;
 }
 
 /*!
@@ -135,12 +135,12 @@ bool QCameraInfo::isNull() const
 */
 QByteArray QCameraInfo::id() const
 {
-    return d->id;
+    return d ? d->id : QByteArray();
 }
 
 bool QCameraInfo::isDefault() const
 {
-    return d->isDefault;
+    return d ? d->isDefault : false;
 }
 
 /*!
@@ -148,7 +148,7 @@ bool QCameraInfo::isDefault() const
 */
 QString QCameraInfo::description() const
 {
-    return d->description;
+    return d ? d->description : QString();
 }
 
 /*!
@@ -156,7 +156,7 @@ QString QCameraInfo::description() const
 */
 QCamera::Position QCameraInfo::position() const
 {
-    return d->position;
+    return d ? d->position : QCamera::UnspecifiedPosition;
 }
 
 /*!
@@ -175,7 +175,7 @@ QCamera::Position QCameraInfo::position() const
 */
 int QCameraInfo::orientation() const
 {
-    return d->orientation;
+    return d ? d->orientation : 0;
 }
 
 QCameraInfo::QCameraInfo(QCameraInfoPrivate *p)
diff --git a/src/multimedia/camera/qcamerainfo_p.h b/src/multimedia/camera/qcamerainfo_p.h
index b74579e8c..377a418e3 100644
--- a/src/multimedia/camera/qcamerainfo_p.h
+++ b/src/multimedia/camera/qcamerainfo_p.h
@@ -61,7 +61,6 @@ class QCameraInfoPrivate : public QSharedData
 public:
     QByteArray id;
     QString description;
-    bool isNull = true;
     bool isDefault = false;
     QCamera::Position position = QCamera::UnspecifiedPosition;
     int orientation = 0;
diff --git a/src/multimedia/recording/qmediarecorder_p.h b/src/multimedia/recording/qmediarecorder_p.h
index 630dd46d3..ecfc030b1 100644
--- a/src/multimedia/recording/qmediarecorder_p.h
+++ b/src/multimedia/recording/qmediarecorder_p.h
@@ -74,7 +74,7 @@ public:
     void applySettingsLater();
     void restartCamera();
 
-    QMediaSource *mediaSource = nullptr;
+    QPointer<QMediaSource> mediaSource;
 
     QMediaRecorderControl *control = nullptr;
     QMediaContainerControl *formatControl = nullptr;