diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-02-01 08:14:18 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-02-01 07:46:57 +0000 |
| commit | 1efcc6c1742126eb1c83fded27a42ae721494f71 (patch) | |
| tree | f337f291fd1f054cb883b5173eb30cae126384fd /src/assistant | |
| parent | 8ccf60bfc25504c89ac632f1ddefecabf741fdee (diff) | |
| download | qttools-1efcc6c1742126eb1c83fded27a42ae721494f71.tar.gz | |
Fix deprecated QMenu::addAction() overloads
Amends qtbase/0e02f6536acb721a55af12c11fef27299b354d24.
Fixes: QTBUG-100357
Pick-to: 6.3
Change-Id: I51869f8fbc111232784e41db642db8a152b7aa52
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/assistant')
| -rw-r--r-- | src/assistant/assistant/bookmarkmanager.cpp | 4 | ||||
| -rw-r--r-- | src/assistant/assistant/mainwindow.cpp | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/assistant/assistant/bookmarkmanager.cpp b/src/assistant/assistant/bookmarkmanager.cpp index f82d5ade6..67ade7e9b 100644 --- a/src/assistant/assistant/bookmarkmanager.cpp +++ b/src/assistant/assistant/bookmarkmanager.cpp @@ -385,8 +385,8 @@ void BookmarkManager::refreshBookmarkMenu() bookmarkMenu->addAction(tr("Manage Bookmarks..."), this, &BookmarkManager::manageBookmarks); bookmarkMenu->addAction(QIcon::fromTheme("bookmark-new"), tr("Add Bookmark..."), - this, &BookmarkManager::addBookmarkActivated, - QKeySequence(tr("Ctrl+D"))); + QKeySequence(tr("Ctrl+D")), + this, &BookmarkManager::addBookmarkActivated); bookmarkMenu->addSeparator(); diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp index b36aaed68..8366b5321 100644 --- a/src/assistant/assistant/mainwindow.cpp +++ b/src/assistant/assistant/mainwindow.cpp @@ -551,16 +551,16 @@ void MainWindow::setupActions() m_viewMenu->addSeparator(); - m_viewMenu->addAction(tr("Contents"), - this, &MainWindow::showContents, QKeySequence(tr("ALT+C"))); - m_viewMenu->addAction(tr("Index"), - this, &MainWindow::showIndex, QKeySequence(tr("ALT+I"))); - m_viewMenu->addAction(tr("Bookmarks"), - this, &MainWindow::showBookmarksDockWidget, QKeySequence(tr("ALT+O"))); - m_viewMenu->addAction(tr("Search"), - this, &MainWindow::showSearch, QKeySequence(tr("ALT+S"))); - m_viewMenu->addAction(tr("Open Pages"), - this, &MainWindow::showOpenPages, QKeySequence(tr("ALT+P"))); + m_viewMenu->addAction(tr("Contents"), QKeySequence(tr("ALT+C")), + this, &MainWindow::showContents); + m_viewMenu->addAction(tr("Index"), QKeySequence(tr("ALT+I")), + this, &MainWindow::showIndex); + m_viewMenu->addAction(tr("Bookmarks"), QKeySequence(tr("ALT+O")), + this, &MainWindow::showBookmarksDockWidget); + m_viewMenu->addAction(tr("Search"), QKeySequence(tr("ALT+S")), + this, &MainWindow::showSearch); + m_viewMenu->addAction(tr("Open Pages"), QKeySequence(tr("ALT+P")), + this, &MainWindow::showOpenPages); menu = menuBar()->addMenu(tr("&Go")); menu->addAction(globalActions->homeAction()); |