strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#125934 Qt5 set the desktop file name...

Browse source 
.. but only on wayland, as this also overrides the individual
window icons on X11.

Change-Id: I1b453b23f0dfd4ef2616d7b8054580a6018cdc53
Reviewed-on: https://gerrit.libreoffice.org/74293
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski 2019-06-18 14:11:31 +00:00
parent 3cc152695a
commit 17c91a53d2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vcl/qt5/Qt5Instance.cxx
View file

@ -243,8 +243,10 @@ Qt5Instance::~Qt5Instance()
void Qt5Instance::AfterAppInit()
{
// sets the default application icon on Wayland
QGuiApplication::setDesktopFileName(QStringLiteral("libreoffice-startcenter.desktop"));
// set the default application icon via destop file just on Wayland,
// as this otherwise overrides the individual desktop icons on X11.
if (QGuiApplication::platformName() == "wayland")
QGuiApplication::setDesktopFileName(QStringLiteral("libreoffice-startcenter.desktop"));
}
void Qt5Instance::deleteObjectLater(QObject* pObject) { pObject->deleteLater(); }