[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/qt5

[Libreoffice Gerrit user]

 vcl/qt5/Qt5Frame.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1ffbe6da60391bcf71c579d4da9543f0b769bfc8
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Feb 27 16:13:48 2019 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Wed Mar 13 00:09:22 2019 +0100

    tdf#104235: Qt5Frame: Set default icon
    
    Set a default icon in Qt5Frame constructor, similar to how it's done
    for the gtk and gtk3 VCL plugins in 'GtkSalFrame::InitCommon'.
    
    Change-Id: I4e4e62ffa0eca6499f4752ff467d004cae68788f
    Reviewed-on: https://gerrit.libreoffice.org/68450
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit cfb2e03a683a8d217b00b8abfd9c55bf61059462)
    Reviewed-on: https://gerrit.libreoffice.org/69123

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 27f331ce2f05..1ecf9cfa9986 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -161,6 +161,8 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
     //m_aSystemData.pWidget = m_pQWidget;
     //m_aSystemData.nScreen = m_nXScreen.getXScreen();
     m_aSystemData.pToolkit = "qt5";
+
+    SetIcon(SV_ICON_ID_OFFICE);
 }
 
 Qt5Frame::~Qt5Frame()