From 969d5b7e09c6b8cbde8f8005d573f9bd1cab54a5 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 10 Jul 2025 01:51:27 +0300 Subject: [PATCH] Android: declare AndroidConnectivityManagerInstance as Q_APPLICATION_STATIC Since global destructors are not reliably fired on Android especially when QT_ANDROID_NO_EXIT_CALL to mitigate crashes at exit, it's better to define AndroidConnectivityManagerInstance as Qt application static instead. Fixed: QTBUG-61093 Change-Id: I8d3e64eaa0406de337c6a03c084e7b82834ce66a --- .../android/src/wrappers/androidconnectivitymanager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/bearer/android/src/wrappers/androidconnectivitymanager.cpp b/src/plugins/bearer/android/src/wrappers/androidconnectivitymanager.cpp index 6787690246c..03e65eccf46 100644 --- a/src/plugins/bearer/android/src/wrappers/androidconnectivitymanager.cpp +++ b/src/plugins/bearer/android/src/wrappers/androidconnectivitymanager.cpp @@ -38,6 +38,8 @@ ****************************************************************************/ #include "androidconnectivitymanager.h" + +#include #include #include @@ -69,7 +71,7 @@ struct AndroidConnectivityManagerInstance AndroidConnectivityManager* connManager; }; -Q_GLOBAL_STATIC(AndroidConnectivityManagerInstance, androidConnManagerInstance) +Q_APPLICATION_STATIC(AndroidConnectivityManagerInstance, androidConnManagerInstance) static const char networkReceiverClass[] = "org/qtproject/qt5/android/bearer/QtNetworkReceiver"; static const char trafficStatsClass[] = "android/net/TrafficStats"; -- 2.39.5 (Apple Git-154)