summaryrefslogtreecommitdiff
path: root/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-01 14:23:52 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-02-13 08:06:28 +0000
commitbf35eea0cf838a3bb125f22d0b7a10c39cb621eb (patch)
treee5b864c68ddba7c1334a77daeb84fe91ffce8a4d /src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp
parent044c7bc581db1f24f02f5eb25e5964105f6a2c90 (diff)
downloadqtwayland-bf35eea0cf838a3bb125f22d0b7a10c39cb621eb.tar.gz
Disambiguate static variables
They cause clashes in CMake Unity (Jumbo) builds. Task-number: QTBUG-109394 Change-Id: Ia6e293fa30d788f8abd52bf675f11d7d0151259f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 948fbd1cd64f9d5e129deade61ecd3dbc5f9b60f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp')
-rw-r--r--src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp
index 2551cedb..a92c3f35 100644
--- a/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp
+++ b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp
@@ -12,17 +12,17 @@ QT_BEGIN_NAMESPACE
namespace QtWayland {
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
+Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, qwsbifLoader,
(QtWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration-server"), Qt::CaseInsensitive))
QStringList ServerBufferIntegrationFactory::keys()
{
- return loader->keyMap().values();
+ return qwsbifLoader->keyMap().values();
}
ServerBufferIntegration *ServerBufferIntegrationFactory::create(const QString &name, const QStringList &args)
{
- return qLoadPlugin<ServerBufferIntegration, ServerBufferIntegrationPlugin>(loader(), name, args);
+ return qLoadPlugin<ServerBufferIntegration, ServerBufferIntegrationPlugin>(qwsbifLoader(), name, args);
}
}