diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-27 11:46:12 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-31 18:42:15 +0100 |
| commit | 25537f5fdc9a19e54ad639bdec80e8a1b5805fdd (patch) | |
| tree | 74543e4574704740baba825744c8728aef48ba1d /src/network/kernel/qnetworkinformation.cpp | |
| parent | dc678299c8d38c11d1aa3f531e5d62dc2685bfa7 (diff) | |
QtNetwork: Disambiguate static variables
They causes clashes in CMake Unity (Jumbo) builds.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Ifd0539c3b56dc395a860de927736f60ad766224a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/kernel/qnetworkinformation.cpp')
| -rw-r--r-- | src/network/kernel/qnetworkinformation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/kernel/qnetworkinformation.cpp b/src/network/kernel/qnetworkinformation.cpp index 16d8e4d0409..fc40787067a 100644 --- a/src/network/kernel/qnetworkinformation.cpp +++ b/src/network/kernel/qnetworkinformation.cpp @@ -26,7 +26,7 @@ struct QNetworkInformationDeleter void operator()(QNetworkInformation *information) { delete information; } }; -Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, +Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, qniLoader, (QNetworkInformationBackendFactory_iid, QStringLiteral("/networkinformation"))) @@ -84,7 +84,7 @@ private: bool QNetworkInformationPrivate::initializeList() { - if (!loader()) + if (!qniLoader()) return false; if (!dataHolder()) return false; @@ -92,11 +92,11 @@ bool QNetworkInformationPrivate::initializeList() QMutexLocker initLocker(&mutex); #if QT_CONFIG(library) - loader->update(); + qniLoader->update(); #endif // Instantiates the plugins (and registers the factories) int index = 0; - while (loader->instance(index)) + while (qniLoader->instance(index)) ++index; initLocker.unlock(); |