diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-10 19:26:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-10 19:26:21 +0200 |
| commit | 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7 (patch) | |
| tree | 406ffa7e3ae0a346a14175ccccb8ac7e596d8f8f /src/plugins/winrt/qwinrtcameracontrol.h | |
| parent | fa9fe9ff8c3aba25fbae4f8f32588dd6477d6df8 (diff) | |
| parent | f0e0d5d901d4e28fff9f29caf86ada84906b3db4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/winrt/qwinrtcameracontrol.cpp
Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
Diffstat (limited to 'src/plugins/winrt/qwinrtcameracontrol.h')
| -rw-r--r-- | src/plugins/winrt/qwinrtcameracontrol.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/winrt/qwinrtcameracontrol.h b/src/plugins/winrt/qwinrtcameracontrol.h index b3c86adf9..c657d5935 100644 --- a/src/plugins/winrt/qwinrtcameracontrol.h +++ b/src/plugins/winrt/qwinrtcameracontrol.h @@ -38,8 +38,11 @@ #define QWINRTCAMERACONTROL_H #include <QtMultimedia/QCameraControl> +#include <QtCore/QLoggingCategory> #include <QtCore/qt_windows.h> +#include <wrl.h> + namespace ABI { namespace Windows { namespace Media { @@ -57,6 +60,8 @@ namespace ABI { QT_BEGIN_NAMESPACE +Q_DECLARE_LOGGING_CATEGORY(lcMMCamera) + class QVideoRendererControl; class QVideoDeviceSelectorControl; class QCameraImageCaptureControl; @@ -90,7 +95,7 @@ public: QCameraFocusControl *cameraFocusControl() const; QCameraLocksControl *cameraLocksControl() const; - ABI::Windows::Media::Capture::IMediaCapture *handle() const; + Microsoft::WRL::ComPtr<ABI::Windows::Media::Capture::IMediaCapture> handle() const; bool setFocus(QCameraFocus::FocusModes mode); bool setFocusPoint(const QPointF &point); |