fix: remove kwayland-shell env

remove kwayland-shell env Log: remove kwayland-shell env
linuxdeepin · Nov 7, 2024 · 687a044 · 687a044
1 parent 9e55dd3
commit 687a044
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+deepin-editor (6.5.4) unstable; urgency=medium
+
+  * remove kwayland-shell env 
+
+ -- Liu zheng <[email protected]>  Wed, 06 Nov 2024 16:02:37 +0800
+
 deepin-editor (6.5.3) unstable; urgency=medium
 
   * New version 6.5.3

diff --git a/src/common/utils.cpp b/src/common/utils.cpp
@@ -899,13 +899,6 @@ bool Utils::isWayland()
     return protocol.contains("wayland");
 }
 
-/**
-   @return 返回当前桌面环境是否是 Treeland
- */
-bool Utils::isTreeland()
-{
-    return qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == QStringLiteral("TreeLand");
-}
 
 QString Utils::lineFeed(const QString &text, int nWidth, const QFont &font, int nElidedRow)
 {

diff --git a/src/common/utils.h b/src/common/utils.h
@@ -129,7 +129,6 @@ class Utils
     static SystemVersion getSystemVersion();
 
     static bool isWayland();
-    static bool isTreeland();
 
     // 计算换行内容 text: 原始文本内容， nWidth: 一行最大宽度， font:字体大小, nElideRow:
     // 最大显示行数，超出最大行时，中间内容加···省略号显示

diff --git a/src/main.cpp b/src/main.cpp
@@ -38,9 +38,6 @@ int main(int argc, char *argv[])
         setenv("XDG_CURRENT_DESKTOP", "Deepin", 1);
     }
 
-    if (Utils::isWayland() && !Utils::isTreeland()) {
-        qputenv("QT_WAYLAND_SHELL_INTEGRATION", "kwayland-shell");
-    }
     QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
     // QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);