summaryrefslogtreecommitdiffstats
path: root/src/client/shellintegration
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-01 14:23:52 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-13 08:52:06 +0100
commit948fbd1cd64f9d5e129deade61ecd3dbc5f9b60f (patch)
tree6ff5b6cd6a15553a245409e188b5b8f3f01b426a /src/client/shellintegration
parentc5a253cc87c75640d828407cc85832d9be28cbbc (diff)
Disambiguate static variables
They cause clashes in CMake Unity (Jumbo) builds. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: Ia6e293fa30d788f8abd52bf675f11d7d0151259f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/client/shellintegration')
-rw-r--r--src/client/shellintegration/qwaylandshellintegrationfactory.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/shellintegration/qwaylandshellintegrationfactory.cpp b/src/client/shellintegration/qwaylandshellintegrationfactory.cpp
index c8d29e27c..feedb27c5 100644
--- a/src/client/shellintegration/qwaylandshellintegrationfactory.cpp
+++ b/src/client/shellintegration/qwaylandshellintegrationfactory.cpp
@@ -12,18 +12,18 @@ QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
+Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, qwsifLoader,
(QWaylandShellIntegrationFactoryInterface_iid, QLatin1String("/wayland-shell-integration"), Qt::CaseInsensitive))
QStringList QWaylandShellIntegrationFactory::keys()
{
- return loader->keyMap().values();
+ return qwsifLoader->keyMap().values();
}
QWaylandShellIntegration *QWaylandShellIntegrationFactory::create(const QString &name, QWaylandDisplay *display, const QStringList &args)
{
std::unique_ptr<QWaylandShellIntegration> integration;
- integration.reset(qLoadPlugin<QWaylandShellIntegration, QWaylandShellIntegrationPlugin>(loader(), name, args));
+ integration.reset(qLoadPlugin<QWaylandShellIntegration, QWaylandShellIntegrationPlugin>(qwsifLoader(), name, args));
if (integration && !integration->initialize(display))
return nullptr;