Merge branch 'Applications/19.04'

This commit is contained in:
Nate Graham 2019-04-18 13:17:13 -06:00
commit 546ff9a19e
2 changed files with 1 additions and 2 deletions

View file

@ -1103,7 +1103,6 @@ void DolphinMainWindow::setupActions()
{
// setup 'File' menu
m_newFileMenu = new DolphinNewFileMenu(actionCollection(), this);
m_newFileMenu->setObjectName("newFileMenu");
QMenu* menu = m_newFileMenu->menu();
menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));

View file

@ -243,7 +243,7 @@ void DolphinMainWindowTest::testNewFileMenuEnabled()
QVERIFY(QTest::qWaitForWindowExposed(m_mainWindow.data()));
QVERIFY(m_mainWindow->isVisible());
auto newFileMenu = m_mainWindow->findChild<DolphinNewFileMenu*>("newFileMenu");
auto newFileMenu = m_mainWindow->findChild<DolphinNewFileMenu*>("new_menu");
QVERIFY(newFileMenu);
QFETCH(bool, expectedEnabled);