1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1618388786

Browse Source
This commit is contained in:
Qt CI Bot 2021-04-14 10:52:21 +00:00
commit b7a3aa39e7
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtFrameworkHelpers.cmake
View File

@ -23,7 +23,7 @@ macro(qt_find_apple_system_frameworks)
qt_internal_find_apple_system_framework(FWSystemConfiguration SystemConfiguration) qt_internal_find_apple_system_framework(FWSystemConfiguration SystemConfiguration)
qt_internal_find_apple_system_framework(FWUIKit UIKit) qt_internal_find_apple_system_framework(FWUIKit UIKit)
qt_internal_find_apple_system_framework(FWCoreLocation CoreLocation) qt_internal_find_apple_system_framework(FWCoreLocation CoreLocation)
qt_internal_find_apple_system_framework(FWCoreMotion CoreMotion)
qt_internal_find_apple_system_framework(FWWatchKit WatchKit) qt_internal_find_apple_system_framework(FWWatchKit WatchKit)
qt_internal_find_apple_system_framework(FWGameController GameController) qt_internal_find_apple_system_framework(FWGameController GameController)
endif() endif()

18
src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
View File

@ -305,10 +305,7 @@ QNetworkListManagerNetworkInformationBackend::~QNetworkListManagerNetworkInforma
{ {
if (comInitFailed) if (comInitFailed)
return; return;
if (monitoring) stop();
stop();
else
CoUninitialize();
} }
void QNetworkListManagerNetworkInformationBackend::setConnectivity(NLM_CONNECTIVITY newConnectivity) void QNetworkListManagerNetworkInformationBackend::setConnectivity(NLM_CONNECTIVITY newConnectivity)
@ -354,12 +351,13 @@ bool QNetworkListManagerNetworkInformationBackend::start()
void QNetworkListManagerNetworkInformationBackend::stop() void QNetworkListManagerNetworkInformationBackend::stop()
{ {
Q_ASSERT(managerEvents); if (monitoring) {
Q_ASSERT(monitoring); Q_ASSERT(managerEvents);
// Can return false but realistically shouldn't since that would break everything: // Can return false but realistically shouldn't since that would break everything:
managerEvents->stop(); managerEvents->stop();
monitoring = false; monitoring = false;
managerEvents.Reset(); managerEvents.Reset();
}
CoUninitialize(); CoUninitialize();
comInitFailed = true; // we check this value in start() to see if we need to re-initialize comInitFailed = true; // we check this value in start() to see if we need to re-initialize