slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed QCamera::captureMode property to QFlags

Browse Source 
This enables the expression of extra camera modes like
viewfinder only or capture during video recording.

Change-Id: Ie02fdeef5eb7fd6fc2f133c1afb0141e37c22b06
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-01-12 16:27:34 +10:00
committed by Qt by Nokia
parent a6268601c9
commit 53d71baed3
22 changed files with 88 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/simulator/camera/simulatorcamerasession.h
View File

@@ -58,10 +58,10 @@ public:
SimulatorCameraSession(QObject *parent);
~SimulatorCameraSession();
QCamera::CaptureMode captureMode();
void setCaptureMode(QCamera::CaptureMode mode);
QCamera::CaptureModes captureMode();
void setCaptureMode(QCamera::CaptureModes mode);
QDir defaultDir(QCamera::CaptureMode mode) const;
QDir defaultDir(QCamera::CaptureModes mode) const;
QString generateFileName(const QString &prefix, const QDir &dir, const QString &ext) const;
void setImage(const QImage *image);
@@ -82,7 +82,7 @@ signals:
void viewfinderChanged();
private:
QCamera::CaptureMode mCaptureMode;
QCamera::CaptureModes mCaptureMode;
QObject *mViewfinder;
const QImage *mImage;