From 25d387c614554b568d37d8b4964dee7af23e3059 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 1 Feb 2023 14:23:52 +0100 Subject: [PATCH] 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 --- .../qwaylandclientbufferintegrationfactory.cpp | 6 +++--- .../qwaylandserverbufferintegrationfactory.cpp | 6 +++--- .../qwaylandinputdeviceintegrationfactory.cpp | 6 +++--- src/plugins/platforms/wayland/qwaylanddecorationfactory.cpp | 6 +++--- .../shellintegration/qwaylandshellintegrationfactory.cpp | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp index 48310589ed9..65c7a450dbf 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp @@ -12,17 +12,17 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, +Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, qwcbifLoader, (QWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration-client"), Qt::CaseInsensitive)) QStringList QWaylandClientBufferIntegrationFactory::keys() { - return loader->keyMap().values(); + return qwcbifLoader->keyMap().values(); } QWaylandClientBufferIntegration *QWaylandClientBufferIntegrationFactory::create(const QString &name, const QStringList &args) { - return qLoadPlugin(loader(), name, args); + return qLoadPlugin(qwcbifLoader(), name, args); } } diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp index a8b0c1d87a3..e30bb4dc0ca 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp @@ -12,17 +12,17 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, +Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, qwsbifLoader, (QWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration-client"), Qt::CaseInsensitive)) QStringList QWaylandServerBufferIntegrationFactory::keys() { - return loader->keyMap().values(); + return qwsbifLoader->keyMap().values(); } QWaylandServerBufferIntegration *QWaylandServerBufferIntegrationFactory::create(const QString &name, const QStringList &args) { - return qLoadPlugin(loader(), name, args); + return qLoadPlugin(qwsbifLoader(), name, args); } } diff --git a/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp b/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp index d53a91f059f..1c8eb213d14 100644 --- a/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp +++ b/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp @@ -12,17 +12,17 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, +Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, qwidfiLoader, (QWaylandInputDeviceIntegrationFactoryInterface_iid, QLatin1String("/wayland-inputdevice-integration"), Qt::CaseInsensitive)) QStringList QWaylandInputDeviceIntegrationFactory::keys() { - return loader->keyMap().values(); + return qwidfiLoader->keyMap().values(); } QWaylandInputDeviceIntegration *QWaylandInputDeviceIntegrationFactory::create(const QString &name, const QStringList &args) { - return qLoadPlugin(loader(), name, args); + return qLoadPlugin(qwidfiLoader(), name, args); } } diff --git a/src/plugins/platforms/wayland/qwaylanddecorationfactory.cpp b/src/plugins/platforms/wayland/qwaylanddecorationfactory.cpp index e2f1af2f12e..b716a4aeea5 100644 --- a/src/plugins/platforms/wayland/qwaylanddecorationfactory.cpp +++ b/src/plugins/platforms/wayland/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(loader(), name, args); + return qLoadPlugin(qwdfiLoader(), name, args); } } diff --git a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory.cpp b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory.cpp index c8d29e27c6e..feedb27c516 100644 --- a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory.cpp +++ b/src/plugins/platforms/wayland/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 integration; - integration.reset(qLoadPlugin(loader(), name, args)); + integration.reset(qLoadPlugin(qwsifLoader(), name, args)); if (integration && !integration->initialize(display)) return nullptr;