summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuel Nevala <samuel.nevala@intopalo.com>2015-11-26 13:34:10 +0200
committerMaurice Kalinowski <maurice.kalinowski@theqtcompany.com>2015-11-27 14:45:13 +0000
commit1950765b655307fd138f4c48e54d8932c734fbee (patch)
tree2bd68a12395a14c7ce84b9d1a75b74a34868d5a4 /src
parent4b2e4f5924420323ee056a84fe920c109ed67b24 (diff)
winrt: Fix Lumia 930 black viewfinder.
Add Lumia 930 to the camera texture blacklist. Task-number: QTBUG-49660 Change-Id: Icc4cdbb5e5e736b2273c46f0537a62aeaad0c605 Reviewed-by: Matti Malinen <matti.malinen@digia.com> Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp b/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp
index 7313ae7a2..fe07581c9 100644
--- a/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp
+++ b/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp
@@ -291,8 +291,9 @@ QWinRTCameraVideoRendererControl::QWinRTCameraVideoRendererControl(const QSize &
HString deviceModel;
hr = deviceInfo->get_SystemProductName(deviceModel.GetAddressOf());
Q_ASSERT_SUCCEEDED(hr);
- // Blacklist Lumia 1520
- setBlitMode(blacklisted(L"RM-937", deviceModel) ? MediaFoundation : DirectVideo);
+ const bool blacklist = blacklisted(L"RM-1045", deviceModel) // Lumia 930
+ || blacklisted(L"RM-937", deviceModel); // Lumia 1520
+ setBlitMode(blacklist ? MediaFoundation : DirectVideo);
#endif
}