From 92171b2a00397847daaa76e142dac2b045c04e56 Mon Sep 17 00:00:00 2001 From: Ye ShanShan Date: Tue, 29 Apr 2025 13:50:42 +0800 Subject: [PATCH] fix: build failed in qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed Q_GLOBAL_STATIC to Q_GLOBAL_STATIC_WITH_ARGS for OrgDeepinDTKPreference initialization This modification provides better type safety and clearer syntax for the complex initialization parameters The change maintains the same functionality while following Qt's recommended practices for static initialization refactor: 更新 DConfig 初始化语法 将 Q_GLOBAL_STATIC 改为 Q_GLOBAL_STATIC_WITH_ARGS 用于 OrgDeepinDTKPreference 初始化 此修改为复杂的初始化参数提供了更好的类型安全性和更清晰的语法 该变更保持了相同的功能,同时遵循 Qt 推荐的静态初始化实践 --- src/kernel/dguiapplicationhelper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kernel/dguiapplicationhelper.cpp b/src/kernel/dguiapplicationhelper.cpp index 014b76ed..9dac46ee 100644 --- a/src/kernel/dguiapplicationhelper.cpp +++ b/src/kernel/dguiapplicationhelper.cpp @@ -119,8 +119,8 @@ Q_GLOBAL_STATIC(DFontManager, _globalFM) #define WINDOW_THEME_KEY "_d_platform_theme" #define DTK_ANIMATIONS_ENV "D_DTK_DISABLE_ANIMATIONS" -Q_GLOBAL_STATIC(OrgDeepinDTKPreference, _d_dconfig, DTK_CORE_NAMESPACE::DConfig::globalThread(), nullptr, - "org.deepin.dtk.preference", DTK_CORE_NAMESPACE::DSGApplication::id(), {}, false, nullptr) +Q_GLOBAL_STATIC_WITH_ARGS(OrgDeepinDTKPreference, _d_dconfig, (DTK_CORE_NAMESPACE::DConfig::globalThread(), nullptr, + "org.deepin.dtk.preference", DTK_CORE_NAMESPACE::DSGApplication::id(), {}, false, nullptr)) /*! @private