[Libreoffice-commits] core.git: vcl/inc vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/inc/qt5/Qt5Instance.hxx |    1 +
 vcl/qt5/Qt5Instance.cxx     |    6 ++++++
 2 files changed, 7 insertions(+)

New commits:
commit 045de7a51f402062f23a3deeb15a199fd039a6f2
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sat Jun 15 11:55:08 2019 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Sat Jun 15 14:54:39 2019 +0200

    tdf#125934 Qt5 set the desktop file name
    
    This is a preliminary fix, so LO on Wayland has an application
    icon at all. As the result, the start center icon will appear as
    the application icon on Wayland for all windows.
    
    For the proper, per QWindow fix, we need some QtCore and QtWayland
    changes, to allow setting the appId per QWindow and eventually a
    Waylnad XDG shell spec update, to officially allow a top level
    window to change its appId.
    
    Change-Id: Icefcfc992836e0c657237984d7d88561b26b06a2
    Reviewed-on: https://gerrit.libreoffice.org/74097
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
index 6c4afd328ee2..2411cdb7f52c 100644
--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
@@ -65,6 +65,7 @@ class VCLPLUG_QT5_PUBLIC Qt5Instance : public QObject,
     bool m_bUpdateFonts;
 
     DECL_LINK(updateStyleHdl, Timer*, void);
+    void AfterAppInit() override;
 
 private Q_SLOTS:
     bool ImplYield(bool bWait, bool bHandleAllCurrentEvents);
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index df6b90363524..7961d5be0209 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -241,6 +241,12 @@ Qt5Instance::~Qt5Instance()
     m_pQApplication.reset();
 }
 
+void Qt5Instance::AfterAppInit()
+{
+    // sets the default application icon on Wayland
+    QGuiApplication::setDesktopFileName(QStringLiteral("libreoffice-startcenter.desktop"));
+}
+
 void Qt5Instance::deleteObjectLater(QObject* pObject) { pObject->deleteLater(); }
 
 SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle)