Merge remote-tracking branch 'origin/5.5.0' into 5.5

Change-Id: I5a5b387b93a4b9dbaa9710e78fd7bf1ca09aa3b3

src/plugins/winrt/qwinrtcameracontrol.cpp

@@ -68,7 +68,7 @@ using namespace ABI::Windows::Media::Devices;
 using namespace ABI::Windows::Media::MediaProperties;
 using namespace ABI::Windows::Storage::Streams;
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 #define RETURN_VOID_AND_EMIT_ERROR(msg) \
     if (FAILED(hr)) { \
@@ -134,6 +134,7 @@ public:
         hr = deviceInfo->get_SystemSku(deviceModel.GetAddressOf());
         Q_ASSERT_SUCCEEDED(hr);
         m_flags |= bufferLockRequired(L"NOKIA RM-976", deviceModel);
+        m_flags |= bufferLockRequired(L"NOKIA RM-1019", deviceModel);
 #endif
     }
 
@@ -852,3 +853,5 @@ HRESULT QWinRTCameraControl::onRecordLimitationExceeded(IMediaCapture *)
     setState(QCamera::LoadedState);
     return S_OK;
 }
+
+QT_END_NAMESPACE