Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource

Conflicts solved in a file:
	src/corelib/io/qstandardpaths_android.cpp

Change-Id: Ie8cef36c1379679ca358df50c56b3c25aa15c5d6

1 files changed, 5 insertions, 6 deletions

diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
index 742c958940..fa9b125544 100644
--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
@@ -429,12 +429,11 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin plugin)
 QObjectList QPluginLoader::staticInstances()
 {
     QObjectList instances;
-    const StaticPluginList *plugins = staticPluginList();
-    if (plugins) {
-        const int numPlugins = plugins->size();
-        instances.reserve(numPlugins);
-        for (int i = 0; i < numPlugins; ++i)
-            instances += plugins->at(i).instance();
+    if (staticPluginList.exists()) {
+        const StaticPluginList &plugins = *staticPluginList;
+        instances.reserve(plugins.size());
+        for (QStaticPlugin plugin : plugins)
+            instances += plugin.instance();
     }
     return instances;
 }