commit 17c91a53d25c0b82524e04a0c108f8e0abc76685
author Jan-Marek Glogowski <glogow@fbihome.de> Tue Jun 18 14:11:31 2019 +0000
committer Jan-Marek Glogowski <glogow@fbihome.de> Tue Jun 18 20:22:32 2019 +0200
tree 722e85ef7305f1c23e7990722c32be506a2b91c3
parent 3cc152695af2117fecc0006ac2d34d43a9df0d86

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

.. 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>

vcl/qt5/Qt5Instance.cxx

diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 7961d5b..f83cf86 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -243,8 +243,10 @@

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(); }