diff options
| author | Nate Graham <[email protected]> | 2019-04-18 13:17:13 -0600 |
|---|---|---|
| committer | Nate Graham <[email protected]> | 2019-04-18 13:17:13 -0600 |
| commit | 546ff9a19e17c60209ab2cdc814ff9fb85a19342 (patch) | |
| tree | 0059403dacd97bfb4014bbcb4161991d623336ff | |
| parent | e26e823909f3d7ef412586b17c171f3c62ec2516 (diff) | |
| parent | 48c082767e3124b1ac6575f83bfcdcdc3e3e9b62 (diff) | |
Merge branch 'Applications/19.04'
| -rw-r--r-- | src/dolphinmainwindow.cpp | 1 | ||||
| -rw-r--r-- | src/tests/dolphinmainwindowtest.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 296cb1400..7224c8ea9 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -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"))); diff --git a/src/tests/dolphinmainwindowtest.cpp b/src/tests/dolphinmainwindowtest.cpp index c98ababa6..3d09699fe 100644 --- a/src/tests/dolphinmainwindowtest.cpp +++ b/src/tests/dolphinmainwindowtest.cpp @@ -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); |