diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-15 11:55:08 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-15 14:54:39 +0200 |
| commit | 045de7a51f402062f23a3deeb15a199fd039a6f2 (patch) | |
| tree | 2f5a6c7c3522310756a5bfbed69a99ea2a454e85 /vcl | |
| parent | f75c2b04785aa05cff3bcd52689feb7400a14e8e (diff) | |
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@fbihome.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/qt5/Qt5Instance.hxx | 1 | ||||
| -rw-r--r-- | vcl/qt5/Qt5Instance.cxx | 6 |
2 files changed, 7 insertions, 0 deletions
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) |