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 | |
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
-rw-r--r-- | dist/changes-5.12.4 | 20 | ||||
-rw-r--r-- | src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp | 5 |
2 files changed, 24 insertions, 1 deletions
diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4 new file mode 100644 index 00000000..a285cd8e --- /dev/null +++ b/dist/changes-5.12.4 @@ -0,0 +1,20 @@ +Qt 5.12.4 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.3. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. 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 |