Merge branch 'Applications/19.04'

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 296cb14007cac771a3d7532931d543a05276c76e..7224c8ea940c166db524c654b0ef78291fbd53f4 100644 (file)
--- 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 c98ababa6aa323824e0c9d503a4d945a3357c2ac..3d09699fee3b2308be4f7bdf1f2d7de188ec93a5 100644 (file)
--- 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);