diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 16:43:44 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 16:43:45 +0100 |
| commit | 0c8be637087a3c7aa038cf72f3a3ed6f7aca0510 (patch) | |
| tree | 9d55f94a9bcb70b60a5f73439fb1c308cea392ca /src/plugins/android/src/mediacapture/qandroidcamerasession.h | |
| parent | f15105a02dc1c6b2b95b8ab0dafd36098840fb0e (diff) | |
| parent | 2c7e734c8b4decc89820cc946ff72c89aee5cde5 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I25197ccc930730be363f8f65624d7fa10c1d33e9
Diffstat (limited to 'src/plugins/android/src/mediacapture/qandroidcamerasession.h')
| -rw-r--r-- | src/plugins/android/src/mediacapture/qandroidcamerasession.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/android/src/mediacapture/qandroidcamerasession.h b/src/plugins/android/src/mediacapture/qandroidcamerasession.h index de891522b..897cf52d1 100644 --- a/src/plugins/android/src/mediacapture/qandroidcamerasession.h +++ b/src/plugins/android/src/mediacapture/qandroidcamerasession.h @@ -127,6 +127,7 @@ private: void processPreviewImage(int id, const QByteArray &data); void processCapturedImage(int id, const QByteArray &data, + const QSize &resolution, QCameraImageCapture::CaptureDestinations dest, const QString &fileName); |