diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-01 14:23:52 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-13 08:06:28 +0000 |
commit | bf35eea0cf838a3bb125f22d0b7a10c39cb621eb (patch) | |
tree | e5b864c68ddba7c1334a77daeb84fe91ffce8a4d /src/client/qwaylanddecorationfactory.cpp | |
parent | 044c7bc581db1f24f02f5eb25e5964105f6a2c90 (diff) | |
download | qtwayland-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/client/qwaylanddecorationfactory.cpp')
-rw-r--r-- | src/client/qwaylanddecorationfactory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/qwaylanddecorationfactory.cpp b/src/client/qwaylanddecorationfactory.cpp index e2f1af2f..b716a4ae 100644 --- a/src/client/qwaylanddecorationfactory.cpp +++ b/src/client/qwaylanddecorationfactory.cpp @@ -12,17 +12,17 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, +Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, qwdfiLoader, (QWaylandDecorationFactoryInterface_iid, QLatin1String("/wayland-decoration-client"), Qt::CaseInsensitive)) QStringList QWaylandDecorationFactory::keys() { - return loader->keyMap().values(); + return qwdfiLoader->keyMap().values(); } QWaylandAbstractDecoration *QWaylandDecorationFactory::create(const QString &name, const QStringList &args) { - return qLoadPlugin<QWaylandAbstractDecoration, QWaylandDecorationPlugin>(loader(), name, args); + return qLoadPlugin<QWaylandAbstractDecoration, QWaylandDecorationPlugin>(qwdfiLoader(), name, args); } } |