Skip to content

fix: remove kwayland-shell env #124

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

Merged
deepin-bot merged 1 commit into from
Nov 7, 2024
Merged

fix: remove kwayland-shell env #124

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-reader (6.5.4) unstable; urgency=medium

*remove kwayland-shell env

-- Liu zheng <liuzheng@uniontech.com> Wed, 06 Nov 2024 16:11:13 +0800

deepin-reader (6.5.3) unstable; urgency=medium

* Fix pdf conflict problem
Expand Down
3 changes: 0 additions & 3 deletions deepin_reader.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,3 @@ SUBDIRS += htmltopdf

SUBDIRS += reader

contains(QMAKE_HOST.arch, x86_64) | contains(QMAKE_HOST.arch, aarch64): {
SUBDIRS += tests
}
5 changes: 0 additions & 5 deletions reader/app/Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,11 +308,6 @@ bool Utils::isWayland()
}
}

bool Utils::isTreeland()
{
return qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == QStringLiteral("TreeLand");
}

void Utils::setCurrentFilePath(QString currentFilePath)
{
m_currenFilePath = currentFilePath;
Expand Down
5 changes: 0 additions & 5 deletions reader/app/Utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,6 @@ class Utils : public QObject
*/
static bool isWayland();

/**
* @return 返回当前桌面环境是否为 Treeland
*/
static bool isTreeland();

/**
* @brief 设置当前操作的文档名称
* @param currentFilePath
Expand Down
5 changes: 0 additions & 5 deletions reader/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ int main(int argc, char *argv[])

// Init DTK.
Application a(argc, argv);

if (Utils::isWayland() && !Utils::isTreeland()) {
qputenv("QT_WAYLAND_SHELL_INTEGRATION", "kwayland-shell");
}

QCommandLineParser parser;
parser.addHelpOption();
parser.addOptions({
Expand Down