diff --git a/debian/changelog b/debian/changelog index a5f4031d..45986c57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +deepin-manual (6.5.5) unstable; urgency=medium + + * remove kwayland-shell env + + -- Liu zheng Thu, 07 Nov 2024 08:17:44 +0800 + deepin-manual (6.5.4) unstable; urgency=medium * fix: fail to view application manual. diff --git a/src/app/dman.cpp b/src/app/dman.cpp index 84f2b20d..499c6aba 100755 --- a/src/app/dman.cpp +++ b/src/app/dman.cpp @@ -70,8 +70,6 @@ int main(int argc, char **argv) #endif if (Utils::judgeWayLand()) { - if (!Utils::judgeTreeLand()) - qputenv("QT_WAYLAND_SHELL_INTEGRATION", "kwayland-shell"); qputenv("_d_disableDBusFileDialog", "true"); setenv("PULSE_PROP_media.role", "video", 1); QSurfaceFormat format; diff --git a/src/base/utils.cpp b/src/base/utils.cpp index 2048fa38..2c177030 100755 --- a/src/base/utils.cpp +++ b/src/base/utils.cpp @@ -242,13 +242,6 @@ bool Utils::judgeWayLand() return false; } -bool Utils::judgeTreeLand() -{ - if (qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == "TreeLand") - return true; - return false; -} - QStringList Utils::getMdsourcePath() { QStringList sourcePath; diff --git a/src/base/utils.h b/src/base/utils.h index 8e5aaac5..02533610 100755 --- a/src/base/utils.h +++ b/src/base/utils.h @@ -51,8 +51,6 @@ class Utils : public QObject static bool judgeLoongson(); //判断是否Wayland static bool judgeWayLand(); - //判断是否treeland - static bool judgeTreeLand(); //获取md文件路径 static QStringList getMdsourcePath(); //获取环境变量