commit f9cc6303d80ee70e44ce090c6ad2714f7430a7c9
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 23:29:33 2019 +0200
tree 7b0fefa172342f2487b05fd2fec982fcf5350c1d
parent 60d83e5d5490bb488e26f52d5aeee667ffd206fd

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>
(cherry picked from commit 17c91a53d25c0b82524e04a0c108f8e0abc76685)
Reviewed-on: https://gerrit.libreoffice.org/74304

vcl/qt5/Qt5Instance.cxx

diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 26e2e57..556e8a6 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -242,8 +242,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(); }