diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-13 11:02:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-13 11:02:04 +0200 |
| commit | 49461f9cffa5439e536a844ec3a0134c252141e6 (patch) | |
| tree | 3d645b3c8fe5d9b374c6df8e12705ee090596d42 /src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp | |
| parent | 7b0cae6c4f9f417e14a1553cd206bd929d299dbb (diff) | |
| parent | 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I773db005bbdc511169917ee35eb5b517e898926b
Diffstat (limited to 'src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp')
| -rw-r--r-- | src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp b/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp index 43b3d24e2..a94e1c578 100644 --- a/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp +++ b/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp @@ -48,7 +48,7 @@ #include "qwinrtcameracontrol.h" -#ifdef Q_OS_WINPHONE +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) #include <Windows.Security.ExchangeActiveSyncProvisioning.h> using namespace ABI::Windows::Security::ExchangeActiveSyncProvisioning; #endif @@ -58,7 +58,7 @@ using namespace Microsoft::WRL::Wrappers; QT_BEGIN_NAMESPACE -#ifdef Q_OS_WINPHONE +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) template <int n> static bool blacklisted(const wchar_t (&blackListName)[n], const HString &deviceModel) { @@ -285,7 +285,7 @@ QWinRTCameraVideoRendererControl::QWinRTCameraVideoRendererControl(const QSize & d->cameraSampleformat = QVideoFrame::Format_User; d->videoProbesCounter = 0; -#ifdef Q_OS_WINPHONE +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) // Workaround for certain devices which fail to blit. ComPtr<IEasClientDeviceInformation> deviceInfo; HRESULT hr = RoActivateInstance(HString::MakeReference(RuntimeClass_Windows_Security_ExchangeActiveSyncProvisioning_EasClientDeviceInformation).Get(), |