diff --git a/debian/changelog b/debian/changelog index d2b38593..b34275cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +deepin-system-monitor (6.5.3) unstable; urgency=medium + + * remove kwayland-shell env + + -- Liu zheng Wed, 06 Nov 2024 15:59:09 +0800 + deepin-system-monitor (6.5.2) unstable; urgency=medium * chore: clear obsolete *.psd files(Bug: 267081) diff --git a/deepin-system-monitor-main/common/common.cpp b/deepin-system-monitor-main/common/common.cpp index c05ce722..11eb94e0 100644 --- a/deepin-system-monitor-main/common/common.cpp +++ b/deepin-system-monitor-main/common/common.cpp @@ -201,23 +201,7 @@ int specialComType = -1; void WaylandSearchCentered() { -#ifdef USE_DEEPIN_WAYLAND - auto e = QProcessEnvironment::systemEnvironment(); - - QString XDG_SESSION_TYPE = e.value(QStringLiteral("XDG_SESSION_TYPE")); - QString WAYLAND_DISPLAY = e.value(QStringLiteral("WAYLAND_DISPLAY")); - - if (XDG_SESSION_TYPE == QLatin1String("wayland") || WAYLAND_DISPLAY.contains(QLatin1String("wayland"), Qt::CaseInsensitive)) { - WaylandCentered = true; - if (!common::systemInfo().isOldVersion() && !common::systemInfo().isTreeLand()) - qputenv("QT_WAYLAND_SHELL_INTEGRATION", "kwayland-shell"); - } else { - WaylandCentered = false; - } -#else WaylandCentered = false; -#endif //USE_DEEPIN_WAYLAND - } static void init_shell_list()