QNI: Add a convenience method for loading the default plugin

We have some official plugins, we may as well treat them as default
and give a convenient function which loads those.

Change-Id: I6251c77ac042b795bcf24b86e510e960ee4bab54
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

4 files changed, 27 insertions, 13 deletions

diff --git a/src/plugins/networkinformation/android/qandroidnetworkinformationbackend.cpp b/src/plugins/networkinformation/android/qandroidnetworkinformationbackend.cpp
index 14e42a9de8..8f90ea82bd 100644
--- a/src/plugins/networkinformation/android/qandroidnetworkinformationbackend.cpp
+++ b/src/plugins/networkinformation/android/qandroidnetworkinformationbackend.cpp
@@ -47,7 +47,10 @@ QT_BEGIN_NAMESPACE
 Q_DECLARE_LOGGING_CATEGORY(lcNetInfoAndroid)
 Q_LOGGING_CATEGORY(lcNetInfoAndroid, "qt.network.info.android");
 
-static const QString backendName = QStringLiteral("android");
+static QString backendName() {
+    return QString::fromUtf16(QNetworkInformationBackend::PluginNames
+                                      [QNetworkInformationBackend::PluginNamesAndroidIndex]);
+}
 
 class QAndroidNetworkInformationBackend : public QNetworkInformationBackend
 {
@@ -56,7 +59,7 @@ public:
     QAndroidNetworkInformationBackend();
     ~QAndroidNetworkInformationBackend() { m_valid = false; }
 
-    QString name() const override { return backendName; }
+    QString name() const override { return backendName(); }
     QNetworkInformation::Features featuresSupported() const override
     {
         return featuresSupportedStatic();
@@ -88,7 +91,7 @@ class QAndroidNetworkInformationBackendFactory : public QNetworkInformationBacke
 public:
     QAndroidNetworkInformationBackendFactory() = default;
     ~QAndroidNetworkInformationBackendFactory() = default;
-    QString name() const override { return backendName; }
+    QString name() const override { return backendName(); }
     QNetworkInformation::Features featuresSupported() const override
     {
         return QAndroidNetworkInformationBackend::featuresSupportedStatic();
diff --git a/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
index e8b36be02e..3e6e4074bb 100644
--- a/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
+++ b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
@@ -50,7 +50,11 @@ QT_BEGIN_NAMESPACE
 // Declared in qnetworklistmanagerevents.h
 Q_LOGGING_CATEGORY(lcNetInfoNLM, "qt.network.info.netlistmanager");
 
-static const QString backendName = QStringLiteral("networklistmanager");
+static QString backendName()
+{
+    return QString::fromUtf16(QNetworkInformationBackend::PluginNames
+                                      [QNetworkInformationBackend::PluginNamesWindowsIndex]);
+}
 
 namespace {
 bool testCONNECTIVITY(NLM_CONNECTIVITY connectivity, NLM_CONNECTIVITY flag)
@@ -90,7 +94,7 @@ public:
     QNetworkListManagerNetworkInformationBackend();
     ~QNetworkListManagerNetworkInformationBackend();
 
-    QString name() const override { return backendName; }
+    QString name() const override { return backendName(); }
     QNetworkInformation::Features featuresSupported() const override
     {
         return featuresSupportedStatic();
@@ -130,7 +134,7 @@ class QNetworkListManagerNetworkInformationBackendFactory : public QNetworkInfor
 public:
     QNetworkListManagerNetworkInformationBackendFactory() = default;
     ~QNetworkListManagerNetworkInformationBackendFactory() = default;
-    QString name() const override { return backendName; }
+    QString name() const override { return backendName(); }
     QNetworkInformation::Features featuresSupported() const override
     {
         return QNetworkListManagerNetworkInformationBackend::featuresSupportedStatic();
diff --git a/src/plugins/networkinformation/networkmanager/qnetworkmanagernetworkinformationbackend.cpp b/src/plugins/networkinformation/networkmanager/qnetworkmanagernetworkinformationbackend.cpp
index ad61b6baea..5e2f4b61e6 100644
--- a/src/plugins/networkinformation/networkmanager/qnetworkmanagernetworkinformationbackend.cpp
+++ b/src/plugins/networkinformation/networkmanager/qnetworkmanagernetworkinformationbackend.cpp
@@ -120,7 +120,11 @@ transportMediumFromDeviceType(QNetworkManagerInterface::NMDeviceType type)
 }
 }
 
-static QString backendName = QStringLiteral("networkmanager");
+static QString backendName()
+{
+    return QString::fromUtf16(QNetworkInformationBackend::PluginNames
+                                      [QNetworkInformationBackend::PluginNamesLinuxIndex]);
+}
 
 class QNetworkManagerNetworkInformationBackend : public QNetworkInformationBackend
 {
@@ -129,7 +133,7 @@ public:
     QNetworkManagerNetworkInformationBackend();
     ~QNetworkManagerNetworkInformationBackend() = default;
 
-    QString name() const override { return backendName; }
+    QString name() const override { return backendName(); }
     QNetworkInformation::Features featuresSupported() const override
     {
         if (!isValid())
@@ -160,7 +164,7 @@ class QNetworkManagerNetworkInformationBackendFactory : public QNetworkInformati
 public:
     QNetworkManagerNetworkInformationBackendFactory() = default;
     ~QNetworkManagerNetworkInformationBackendFactory() = default;
-    QString name() const override { return backendName; }
+    QString name() const override { return backendName(); }
     QNetworkInformation::Features featuresSupported() const override
     {
         if (!QNetworkManagerInterfaceBase::networkManagerAvailable())
diff --git a/src/plugins/networkinformation/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm b/src/plugins/networkinformation/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm
index c732afc012..1da671e549 100644
--- a/src/plugins/networkinformation/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm
+++ b/src/plugins/networkinformation/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm
@@ -48,8 +48,11 @@ QT_BEGIN_NAMESPACE
 Q_DECLARE_LOGGING_CATEGORY(lcNetInfoSCR)
 Q_LOGGING_CATEGORY(lcNetInfoSCR, "qt.network.info.scnetworkreachability");
 
-
-static QString backendName = QStringLiteral("scnetworkreachability");
+static QString backendName()
+{
+    return QString::fromUtf16(QNetworkInformationBackend::PluginNames
+                                      [QNetworkInformationBackend::PluginNamesAppleIndex]);
+}
 
 class QSCNetworkReachabilityNetworkInformationBackend : public QNetworkInformationBackend
 {
@@ -58,7 +61,7 @@ public:
     QSCNetworkReachabilityNetworkInformationBackend();
     ~QSCNetworkReachabilityNetworkInformationBackend();
 
-    QString name() const override { return backendName; }
+    QString name() const override { return backendName(); }
     QNetworkInformation::Features featuresSupported() const override
     {
         return featuresSupportedStatic();
@@ -87,7 +90,7 @@ class QSCNetworkReachabilityNetworkInformationBackendFactory : public QNetworkIn
 public:
     QSCNetworkReachabilityNetworkInformationBackendFactory() = default;
     ~QSCNetworkReachabilityNetworkInformationBackendFactory() = default;
-    QString name() const override { return backendName; }
+    QString name() const override { return backendName(); }
     QNetworkInformation::Features featuresSupported() const override
     {
         return QSCNetworkReachabilityNetworkInformationBackend::featuresSupportedStatic();