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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 7, 2024
Merged

fix: remove kwayland-shell env #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions application/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 0 additions & 5 deletions application/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
1 change: 0 additions & 1 deletion application/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading