fix: remove kwayland-shell env

remove kwayland-shell env Log: remove kwayland-shell env
linuxdeepin · Nov 7, 2024 · 03dbe6d · 03dbe6d
1 parent b1eeeb7
commit 03dbe6d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/application/main.cpp b/application/main.cpp
@@ -295,9 +295,6 @@ int main(int argc, char *argv[])
         //klu下不使用opengl 使用OpenGLES,因为opengl基于x11 现在全面换wayland了
         QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
         //klu下不使用opengl 使用OpenGLES,因为opengl基于x11 现在全面换wayland了,这个真正有效
-        if (Utils::isWayland() && !Utils::isTreeland()) {
-            qputenv("QT_WAYLAND_SHELL_INTEGRATION", "kwayland-shell");
-        }
         setenv("PULSE_PROP_media.role", "video", 1);
         QSurfaceFormat format;
         format.setRenderableType(QSurfaceFormat::OpenGLES);

diff --git a/application/utils.cpp b/application/utils.cpp
@@ -274,11 +274,6 @@ bool Utils::isWayland()
     }
 }
 
-bool Utils::isTreeland()
-{
-    return qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == QStringLiteral("TreeLand");
-}
-
 bool Utils::sleep(unsigned int msec)
 {
     QTime dieTime = QTime::currentTime().addMSecs(static_cast<int>(msec));

diff --git a/application/utils.h b/application/utils.h
@@ -59,7 +59,6 @@ class Utils : public QObject
     static bool deleteDir(const QString &iFilePath);
     static void replaceColorfulFont(QString *iStr);
     static bool isWayland();
-    static bool isTreeland();
     static bool sleep(unsigned int msec);
     //创建多级文件夹
     static QString mkMutiDir(const QString &path);

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+deepin-log-viewer (6.5.1) unstable; urgency=medium
+
+  * remove kwayland-shell env 
+
+ -- Liu zheng <[email protected]>  Wed, 06 Nov 2024 17:17:32 +0800
+
 deepin-log-viewer (6.5.0) unstable; urgency=medium
 
   * chore: Code format organization