From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 30 Apr 2020 10:35:57 +0000 (+0200)
Subject: Set desktop name for Wayland
X-Git-Tag: 2.3.6~69
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=dc5eda84b8bb4d4eed09047d1c55a33a8173e746;p=features.git

Set desktop name for Wayland

Fixes bug 11847.

(cherry picked from commit 2a80b0ac01bed283d3f06d6dbe50307b2a3bab15)
---

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 3d88764c73..0094e9d930 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -1027,6 +1027,10 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
 	QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif
 
+#if QT_VERSION >= 0x050700
+	setDesktopFileName(lyx_package);
+#endif
+
 	qsrand(QDateTime::currentDateTime().toTime_t());
 
 	// Install translator for GUI elements.
diff --git a/status.23x b/status.23x
index 3b94c325f7..cb41997c5e 100644
--- a/status.23x
+++ b/status.23x
@@ -68,6 +68,8 @@ What's new
 
 - Fix input of decimal numbers in RtL context (bug 11900).
 
+- Fix the LyX icon in the Wayland dash (bug 11847).
+
 
 * INTERNALS