[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - vcl/qt5

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Nov 30 14:20:52 UTC 2018


 vcl/qt5/Qt5Menu.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 187ec749101a0253a6b04620166f2575287ac06f
Author:     Aleksei Nikiforov <darktemplar at basealt.ru>
AuthorDate: Fri Nov 30 10:42:38 2018 +0300
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Nov 30 15:20:15 2018 +0100

    KDE5: fix build with Qt-5.6
    
    Change-Id: Ic4aef6b22d5b9c7262a534e26363c8f8cef99859
    Reviewed-on: https://gerrit.libreoffice.org/64321
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index c93c1954e54a..8203a30c8112 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -53,7 +53,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos)
         // top-level menu
         if (mpQMenuBar)
         {
-            pQMenu = new QMenu(toQString(aText));
+            pQMenu = new QMenu(toQString(aText), nullptr);
             pSalMenuItem->mpMenu.reset(pQMenu);
 
             if ((nPos != MENU_APPEND)
@@ -77,7 +77,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos)
         if (pSalMenuItem->mpSubMenu)
         {
             // submenu
-            QMenu* pTempQMenu = new QMenu(toQString(aText));
+            QMenu* pTempQMenu = new QMenu(toQString(aText), nullptr);
             pSalMenuItem->mpMenu.reset(pTempQMenu);
 
             if ((nPos != MENU_APPEND)
@@ -102,7 +102,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos)
         {
             if (pSalMenuItem->mnType == MenuItemType::SEPARATOR)
             {
-                QAction* pAction = new QAction();
+                QAction* pAction = new QAction(nullptr);
                 pSalMenuItem->mpAction.reset(pAction);
                 pAction->setSeparator(true);
 
@@ -119,7 +119,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos)
             else
             {
                 // leaf menu
-                QAction* pAction = new QAction(toQString(aText));
+                QAction* pAction = new QAction(toQString(aText), nullptr);
                 pSalMenuItem->mpAction.reset(pAction);
 
                 if ((nPos != MENU_APPEND)


More information about the Libreoffice-commits mailing list