diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-25 13:20:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-25 16:01:45 +0200 |
| commit | 8ee98edfc137ec2941ef60daedbe746c898e0aa8 (patch) | |
| tree | b848c8d68e69f6ea02d9cc81a860d4bb4cc59191 /src/plugins | |
| parent | d94ce8943724779d465e403663a076941c561c68 (diff) | |
| parent | 7df7bc13f1b483504b01685888d3e3b6b6224a87 (diff) | |
| download | qtlocation-8ee98edfc137ec2941ef60daedbe746c898e0aa8.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Id91b04d63ddfe46a44f377add670f704b536c183
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp index 7df49307..a9cc164f 100644 --- a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp +++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp @@ -655,7 +655,10 @@ bool QGeoPositionInfoSourceWinRT::requestAccess() const hr = statics->RequestAccessAsync(&op); return hr; }); - Q_ASSERT_SUCCEEDED(hr); + if (FAILED(hr)) { + qCDebug(lcPositioningWinRT) << __FUNCTION__ << "Requesting access from Xaml thread failed"; + return false; + } // We cannot wait inside the XamlThread as that would deadlock #ifdef Q_OS_WINRT |