Skip to content

Commit

Permalink
fix: remove kwayland-shell env
Browse files Browse the repository at this point in the history
remove kwayland-shell env

Log: remove kwayland-shell env
  • Loading branch information
lzwind authored and deepin-bot[bot] committed Nov 7, 2024
1 parent b581449 commit 4cb611a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
deepin-picker (6.0.3) unstable; urgency=medium

*rmove kwayland-shell

-- Liu zheng <[email protected]> Wed, 06 Nov 2024 15:38:45 +0800

deepin-picker (6.0.2) unstable; urgency=medium

* adapt treeland
Expand Down
10 changes: 0 additions & 10 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@

DWIDGET_USE_NAMESPACE

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

int main(int argc, char *argv[])
{
Expand All @@ -35,12 +31,6 @@ int main(int argc, char *argv[])

// Load DTK xcb plugin.
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)) && !isTreeland()) {
qputenv("QT_WAYLAND_SHELL_INTEGRATION", "kwayland-shell");
}

// Init attributes.
const char *descriptionText = QT_TRANSLATE_NOOP(
Expand Down

0 comments on commit 4cb611a

Please sign in to comment.