doc: Fix QImageCapture related snippets

The code samples were not properly ported to take into account the
changes from the Qt 5 code base.

Fixes: QTBUG-99643
Change-Id: Ie30e39a3a4cdaff2c6881218a6f382396a3d5729
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
(cherry picked from commit e3a38654e668a73a3beb2544f68ca348b0f28dc8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

2 files changed, 20 insertions, 12 deletions

diff --git a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
index 35d9496f0..a6e045b67 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
@@ -55,6 +55,7 @@
 QCamera *camera = 0;
 QMediaRecorder *recorder = 0;
 QImageCapture *imageCapture = 0;
+QVideoWidget *viewfinder = 0;
 
 //! [Camera overview check]
 bool checkCameraAvailability()
@@ -72,9 +73,9 @@ void overview_viewfinder()
     QMediaCaptureSession captureSession;
     camera = new QCamera;
     captureSession.setCamera(camera);
-    QVideoWidget *preview = new QVideoWidget;
-    captureSession.setVideoOutput(preview);
-    preview->show();
+    viewfinder = new QVideoWidget;
+    captureSession.setVideoOutput(viewfinder);
+    viewfinder->show();
 
     camera->start(); // to start the camera
     //! [Camera overview viewfinder]
@@ -135,7 +136,7 @@ void overview_still()
     QMediaCaptureSession captureSession;
     camera = new QCamera;
     captureSession.setCamera(camera);
-    imageCapture = new QImageCapture(camera);
+    imageCapture = new QImageCapture;
     captureSession.setImageCapture(imageCapture);
 
     camera->start(); // Viewfinder frames start flowing
@@ -212,9 +213,9 @@ void camera_blah()
     camera = new QCamera;
     captureSession.setCamera(camera);
 
-    QVideoWidget *preview = new QVideoWidget();
-    preview->show();
-    captureSession.setVideoOutput(preview);
+    viewfinder = new QVideoWidget();
+    viewfinder->show();
+    captureSession.setVideoOutput(viewfinder);
 
     imageCapture = new QImageCapture(camera);
     captureSession.setImageCapture(imageCapture);
diff --git a/src/multimediawidgets/doc/snippets/multimedia-snippets/camera.cpp b/src/multimediawidgets/doc/snippets/multimedia-snippets/camera.cpp
index f6984e7d3..20c6ad7ec 100644
--- a/src/multimediawidgets/doc/snippets/multimedia-snippets/camera.cpp
+++ b/src/multimediawidgets/doc/snippets/multimedia-snippets/camera.cpp
@@ -45,22 +45,29 @@
 
 /* Globals so that everything is consistent. */
 QCamera *camera = 0;
-QCameraViewfinder *viewfinder = 0;
 QImageCapture *imageCapture = 0;
+QVideoWidget *viewfinder = 0;
 
 void camera_blah()
 {
     //! [Camera]
+    QMediaCaptureSession captureSession;
     camera = new QCamera;
+    captureSession.setCamera(camera);
 
     viewfinder = new QVideoWidget();
     viewfinder->show();
+    captureSession.setVideoOutput(viewfinder);
 
-    camera->setViewfinder(viewfinder);
+    imageCapture = new QImageCapture;
+    captureSession.setImageCapture(imageCapture);
 
-    imageCapture = new QImageCapture(camera);
-
-    camera->setCaptureMode(QCamera::CaptureStillImage);
     camera->start();
     //! [Camera]
+
+    //! [Camera keys]
+    //on shutter button pressed
+    imageCapture->capture();
+    //! [Camera keys]
 }
+