summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2016-11-07 09:31:31 +0100
committerOliver Wolff <oliver.wolff@qt.io>2016-11-07 09:32:26 +0000
commit77e6d1cc403d69c509206fd0c0ba4f589277e212 (patch)
tree311c1f33c6f8d4da8495248f744a22fdb34ad517 /src/plugins
parent030e19816a8933a8c6c0a4d8193251446d4ee514 (diff)
Fixed winrt/windows phone build
readyForCaptureChanged cannot be connected to stateChanged as their arguments are not compatible (error: narrowing). Task-number: QTBUG-56927 Change-Id: I31ebc79a22a2d3565a16ab664163bf2d574a527f Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/winrt/qwinrtcameraimagecapturecontrol.cpp7
-rw-r--r--src/plugins/winrt/qwinrtcameraimagecapturecontrol.h4
2 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/winrt/qwinrtcameraimagecapturecontrol.cpp b/src/plugins/winrt/qwinrtcameraimagecapturecontrol.cpp
index 177a0731c..3f2c9ffa3 100644
--- a/src/plugins/winrt/qwinrtcameraimagecapturecontrol.cpp
+++ b/src/plugins/winrt/qwinrtcameraimagecapturecontrol.cpp
@@ -128,7 +128,7 @@ QWinRTCameraImageCaptureControl::QWinRTCameraImageCaptureControl(QWinRTCameraCon
d->cameraControl = parent;
connect(d->cameraControl, &QCameraControl::stateChanged,
- this, &QWinRTCameraImageCaptureControl::readyForCaptureChanged);
+ this, &QWinRTCameraImageCaptureControl::updateReadyForCapture);
d->currentCaptureId = 0;
}
@@ -215,6 +215,11 @@ void QWinRTCameraImageCaptureControl::cancelCapture()
emit captureQueueChanged(true);
}
+void QWinRTCameraImageCaptureControl::updateReadyForCapture(QCamera::State state)
+{
+ emit readyForCaptureChanged(state != QCamera::UnloadedState);
+}
+
HRESULT QWinRTCameraImageCaptureControl::onCaptureCompleted(IAsyncAction *asyncInfo, AsyncStatus status)
{
qCDebug(lcMMCamera) << __FUNCTION__;
diff --git a/src/plugins/winrt/qwinrtcameraimagecapturecontrol.h b/src/plugins/winrt/qwinrtcameraimagecapturecontrol.h
index 177eaf5d7..4cbba0444 100644
--- a/src/plugins/winrt/qwinrtcameraimagecapturecontrol.h
+++ b/src/plugins/winrt/qwinrtcameraimagecapturecontrol.h
@@ -40,6 +40,7 @@
#ifndef QWINRTCAMERAIMAGECAPTURECONTROL_H
#define QWINRTCAMERAIMAGECAPTURECONTROL_H
+#include <QtMultimedia/QCamera>
#include <QtMultimedia/QCameraImageCaptureControl>
#include <QtCore/qt_windows.h>
@@ -71,6 +72,9 @@ public:
int capture(const QString &fileName) Q_DECL_OVERRIDE;
void cancelCapture() Q_DECL_OVERRIDE;
+private slots:
+ void updateReadyForCapture(QCamera::State state);
+
signals:
void captureQueueChanged(bool isEmpty);