summaryrefslogtreecommitdiffstats
path: root/src/multimedia/doc/snippets
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/doc/snippets')
-rw-r--r--src/multimedia/doc/snippets/multimedia-snippets/camera.cpp8
-rw-r--r--src/multimedia/doc/snippets/multimedia-snippets/media.cpp6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
index 0407be1aa..fa2ca6d25 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
@@ -44,7 +44,7 @@
#include "qmediarecorder.h"
#include "qmediadevices.h"
#include "qmediacapturesession.h"
-#include "qcameraimagecapture.h"
+#include "qimagecapture.h"
#include "qvideosink.h"
#include <QtMultimediaWidgets/qvideowidget.h>
#include <QtGui/qscreen.h>
@@ -54,7 +54,7 @@
/* Globals so that everything is consistent. */
QCamera *camera = 0;
QMediaRecorder *recorder = 0;
-QCameraImageCapture *imageCapture = 0;
+QImageCapture *imageCapture = 0;
//! [Camera overview check]
bool checkCameraAvailability()
@@ -135,7 +135,7 @@ void overview_still()
QMediaCaptureSession captureSession;
camera = new QCamera;
captureSession.setCamera(camera);
- imageCapture = new QCameraImageCapture(camera);
+ imageCapture = new QImageCapture(camera);
captureSession.setImageCapture(imageCapture);
camera->start(); // Viewfinder frames start flowing
@@ -216,7 +216,7 @@ void camera_blah()
preview->show();
captureSession.setVideoOutput(preview);
- imageCapture = new QCameraImageCapture(camera);
+ imageCapture = new QImageCapture(camera);
captureSession.setImageCapture(imageCapture);
camera->start();
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
index fd76e679e..1e905484e 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
@@ -47,7 +47,7 @@
#include "qplatformmediaplayer_p.h"
#include "qmediaplayer.h"
#include "qvideowidget.h"
-#include "qcameraimagecapture.h"
+#include "qimagecapture.h"
#include "qcamera.h"
#include "qcameraviewfinder.h"
#include "qaudiorecorder.h"
@@ -73,7 +73,7 @@ private:
QMediaRecorder *recorder;
QCamera *camera;
QCameraViewfinder *viewfinder;
- QCameraImageCapture *imageCapture;
+ QImageCapture *imageCapture;
QString fileName;
QMediaContent image1;
@@ -100,7 +100,7 @@ void MediaExample::recorderSettings()
void MediaExample::imageSettings()
{
//! [Image encoder settings]
- imageCapture->setFileFormat(QCameraImageCapture::JPEG);
+ imageCapture->setFileFormat(QImageCapture::JPEG);
imageCapture->setResolution(1600, 1200);
//! [Image encoder settings]
}