fix: remove kwayland-shell env

remove kwayland-shell env Log: remove kwayland-shell env
linuxdeepin · Nov 11, 2024 · b066deb · b066deb
1 parent 422f29c
commit b066deb
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 16 deletions.
diff --git a/arm64/linglong.yaml b/arm64/linglong.yaml
@@ -7,7 +7,7 @@ version: '1'
 package:
   id: org.deepin.draw
   name: deepin-draw
-  version: 6.5.3.1
+  version: 6.5.4.1
   kind: app
   description: |
     Draw for UOS

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+deepin-draw (6.5.4) unstable; urgency=medium
+
+  * remove kwayland-shell env 
+
+ -- Liu zheng <liuzheng@uniontech.com>  Mon, 11 Nov 2024 11:00:21 +0800
+
 deepin-draw (6.5.3) unstable; urgency=medium
 
   * chore: Update linglong build script.

diff --git a/linglong.yaml b/linglong.yaml
@@ -7,7 +7,7 @@ version: '1'
 package:
   id: org.deepin.draw
   name: deepin-draw
-  version: 6.5.3.1
+  version: 6.5.4.1
   kind: app
   description: |
     Draw for UOS

diff --git a/src/application.cpp b/src/application.cpp
@@ -351,14 +351,6 @@ bool Application::isWaylandPlatform()
     return true;
 }
 
-/**
- * @return 返回当前桌面环境为 Treeland
- */
-bool Application::isTreeland()
-{
-    return qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == QStringLiteral("TreeLand");
-}
-
 bool Application::isTabletSystemEnvir()
 {
 //#if (DTK_VERSION > DTK_VERSION_CHECK(5, 5, 0, 0))

diff --git a/src/application.h b/src/application.h
@@ -166,7 +166,6 @@ class Application : public QObject
     static void setWidgetAccesibleName(QWidget *w, const QString &name);
 
     static bool isWaylandPlatform();
-    static bool isTreeland();
 
     static bool isTabletSystemEnvir();
 

diff --git a/src/deepin-draw/main.cpp b/src/deepin-draw/main.cpp
@@ -73,11 +73,6 @@ int main(int argc, char *argv[])
     DWIDGET_INIT_RESOURCE();
 #endif
 
-    if (Application::isWaylandPlatform() && !Application::isTreeland()) {
-        //添加kwayland-shell，修改了窗口顶部栏无右键菜单
-        qputenv("QT_WAYLAND_SHELL_INTEGRATION", "kwayland-shell");
-    }
-
 #ifdef LINK_DRAWBASELIB_STATIC
     Q_INIT_RESOURCE(drawBaseRes);
     Q_INIT_RESOURCE(frameRes);