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.

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 #41

Merged
merged 1 commit into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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 @@ -34,13 +30,7 @@
}

// Load DTK xcb plugin.
auto e = QProcessEnvironment::systemEnvironment();

Check warning on line 33 in src/main.cpp

View workflow job for this annotation

GitHub Actions / cppcheck

Variable 'e' is assigned a value that is never used.
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
Loading