Kaydet (Commit) 37688ce6 authored tarafından Aleksei Nikiforov's avatar Aleksei Nikiforov Kaydeden (comit) Thorsten Behrens

KDE5: fix build with Qt-5.6

Change-Id: Ic4aef6b22d5b9c7262a534e26363c8f8cef99859
Reviewed-on: https://gerrit.libreoffice.org/64321Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst 919147ff
...@@ -54,7 +54,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos) ...@@ -54,7 +54,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos)
// top-level menu // top-level menu
if (mpQMenuBar) if (mpQMenuBar)
{ {
pQMenu = new QMenu(toQString(aText)); pQMenu = new QMenu(toQString(aText), nullptr);
pSalMenuItem->mpMenu.reset(pQMenu); pSalMenuItem->mpMenu.reset(pQMenu);
if ((nPos != MENU_APPEND) if ((nPos != MENU_APPEND)
...@@ -78,7 +78,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos) ...@@ -78,7 +78,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos)
if (pSalMenuItem->mpSubMenu) if (pSalMenuItem->mpSubMenu)
{ {
// submenu // submenu
QMenu* pTempQMenu = new QMenu(toQString(aText)); QMenu* pTempQMenu = new QMenu(toQString(aText), nullptr);
pSalMenuItem->mpMenu.reset(pTempQMenu); pSalMenuItem->mpMenu.reset(pTempQMenu);
if ((nPos != MENU_APPEND) if ((nPos != MENU_APPEND)
...@@ -103,7 +103,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos) ...@@ -103,7 +103,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos)
{ {
if (pSalMenuItem->mnType == MenuItemType::SEPARATOR) if (pSalMenuItem->mnType == MenuItemType::SEPARATOR)
{ {
QAction* pAction = new QAction(); QAction* pAction = new QAction(nullptr);
pSalMenuItem->mpAction.reset(pAction); pSalMenuItem->mpAction.reset(pAction);
pAction->setSeparator(true); pAction->setSeparator(true);
...@@ -120,7 +120,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos) ...@@ -120,7 +120,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos)
else else
{ {
// leaf menu // leaf menu
QAction* pAction = new QAction(toQString(aText)); QAction* pAction = new QAction(toQString(aText), nullptr);
pSalMenuItem->mpAction.reset(pAction); pSalMenuItem->mpAction.reset(pAction);
if ((nPos != MENU_APPEND) if ((nPos != MENU_APPEND)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment