diff --git a/debian/changelog b/debian/changelog index e7c9c849..618e44d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +deepin-ocr (1.5.1) unstable; urgency=medium + + *remove env kwayland-shell + + -- Liu zheng Wed, 06 Nov 2024 15:33:24 +0800 + deepin-ocr (1.5.0) unstable; urgency=medium * adapt treeland diff --git a/src/main.cpp b/src/main.cpp index 02420419..cb3ecad6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,25 +20,6 @@ DWIDGET_USE_NAMESPACE -bool isTreeland() -{ - return qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == QStringLiteral("TreeLand"); -} - -//判断是否是wayland -bool CheckWayland() -{ - auto e = QProcessEnvironment::systemEnvironment(); - QString XDG_SESSION_TYPE = e.value(QStringLiteral("XDG_SESSION_TYPE")); - QString WAYLAND_DISPLAY = e.value(QStringLiteral("WAYLAND_DISPLAY")); - - if (XDG_SESSION_TYPE == QLatin1String("wayland") || WAYLAND_DISPLAY.contains(QLatin1String("wayland"), Qt::CaseInsensitive)) - return true; - else { - return false; - } -} - int main(int argc, char *argv[]) { @@ -46,11 +27,6 @@ int main(int argc, char *argv[]) qDebug() << "Cant open a null file"; return 0; } - //判断是否是wayland - if (CheckWayland() && !isTreeland()) { - //默认走xdgv6,该库没有维护了,因此需要添加该代码 - qputenv("QT_WAYLAND_SHELL_INTEGRATION", "kwayland-shell"); - } DGuiApplicationHelper::setUseInactiveColorGroup(false); #if(DTK_VERSION < DTK_VERSION_CHECK(5,4,0,0))