Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove kwayland-shell env #503

Merged
merged 1 commit into from
Nov 7, 2024
Merged

fix: remove kwayland-shell env #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
deepin-manual (6.5.5) unstable; urgency=medium

* remove kwayland-shell env

-- Liu zheng <liuzheng@uniontech.com> Thu, 07 Nov 2024 08:17:44 +0800

deepin-manual (6.5.4) unstable; urgency=medium

* fix: fail to view application manual.
Expand Down
2 changes: 0 additions & 2 deletions src/app/dman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions src/base/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions src/base/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ class Utils : public QObject
static bool judgeLoongson();
//判断是否Wayland
static bool judgeWayLand();
//判断是否treeland
static bool judgeTreeLand();
//获取md文件路径
static QStringList getMdsourcePath();
//获取环境变量
Expand Down
Loading