From 21b219f6b7588a59b6d796b1857b6174d7c4150c Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Tue, 1 Apr 2025 10:08:32 +0800 Subject: [PATCH] QLinuxFbIntegration: silence -Wunused-private-field when configured without `evdev`, clang emits -Wunused-private-field Pick-to: 6.8 Change-Id: Ia4ff59c002c1a00ef1b445520c28db0d932ee564 Reviewed-by: Liang Qi (cherry picked from commit eb6042f915c27a9988392eb3ea4bf4b5830cc7d7) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp | 3 +-- src/plugins/platforms/linuxfb/qlinuxfbintegration.h | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp index 361911d52ca..fdc04d37cd1 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp @@ -40,8 +40,7 @@ using namespace Qt::StringLiterals; QLinuxFbIntegration::QLinuxFbIntegration(const QStringList ¶mList) : m_primaryScreen(nullptr), - m_fontDb(new QGenericUnixFontDatabase), - m_kbdMgr(nullptr) + m_fontDb(new QGenericUnixFontDatabase) { #if QT_CONFIG(kms) if (qEnvironmentVariableIntValue("QT_QPA_FB_DRM") != 0) diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h index 2a2b53ea3d6..5f727d866d5 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h @@ -56,7 +56,9 @@ private: mutable QScopedPointer m_services; QScopedPointer m_vtHandler; - QEvdevKeyboardManager *m_kbdMgr; +#if QT_CONFIG(evdev) + QEvdevKeyboardManager *m_kbdMgr = nullptr; +#endif }; QT_END_NAMESPACE