From 5e5063ae4e8024c52973c5cb42041b01352b8d0a Mon Sep 17 00:00:00 2001
From: Liu Zheng <liuzheng@uniontech.com>
Date: Wed, 6 Nov 2024 16:11:23 +0800
Subject: [PATCH] fix: remove kwayland-shell env

remove kwayland-shell env

Log: remove kwayland-shell env
---
 debian/changelog     | 6 ++++++
 deepin_reader.pro    | 3 ---
 reader/app/Utils.cpp | 5 -----
 reader/app/Utils.h   | 5 -----
 reader/main.cpp      | 5 -----
 5 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 143104a2..02ddf2b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/deepin_reader.pro b/deepin_reader.pro
index 322e331a..ac8b4928 100644
--- a/deepin_reader.pro
+++ b/deepin_reader.pro
@@ -17,6 +17,3 @@ SUBDIRS += htmltopdf
 
 SUBDIRS += reader
 
-contains(QMAKE_HOST.arch, x86_64) | contains(QMAKE_HOST.arch, aarch64): {
-    SUBDIRS += tests
-}
diff --git a/reader/app/Utils.cpp b/reader/app/Utils.cpp
index a1b90d11..10bc0701 100644
--- a/reader/app/Utils.cpp
+++ b/reader/app/Utils.cpp
@@ -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;
diff --git a/reader/app/Utils.h b/reader/app/Utils.h
index dfcb2b75..89b2a96b 100644
--- a/reader/app/Utils.h
+++ b/reader/app/Utils.h
@@ -126,11 +126,6 @@ class Utils : public QObject
      */
     static bool isWayland();
 
-    /**
-     * @return 返回当前桌面环境是否为 Treeland
-     */
-    static bool isTreeland();
-
     /**
      * @brief 设置当前操作的文档名称
      * @param currentFilePath
diff --git a/reader/main.cpp b/reader/main.cpp
index b71cb3e0..97c99397 100755
--- a/reader/main.cpp
+++ b/reader/main.cpp
@@ -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({