vcl/inc/qt5/Qt5Instance.hxx | 1 + vcl/qt5/Qt5Instance.cxx | 6 ++++++ 2 files changed, 7 insertions(+)
New commits: commit fda85282ee11d4be5239ea15ee59d37f5f8cf062 Author: Jan-Marek Glogowski <glo...@fbihome.de> AuthorDate: Sat Jun 15 11:55:08 2019 +0200 Commit: Jan-Marek Glogowski <glo...@fbihome.de> CommitDate: Sat Jun 15 16:17:15 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 <glo...@fbihome.de> (cherry picked from commit 045de7a51f402062f23a3deeb15a199fd039a6f2) Reviewed-on: https://gerrit.libreoffice.org/74103 diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx index c87f3c93c1ac..69d871a6368c 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 a7b7aeb8638a..7256ea77ed49 100644 --- a/vcl/qt5/Qt5Instance.cxx +++ b/vcl/qt5/Qt5Instance.cxx @@ -240,6 +240,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) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits