2 files changed, 10 insertions, 8 deletions
diff --git a/src/mainwindow/widgets/navigationbar.cpp b/src/mainwindow/widgets/navigationbar.cpp
index 799ebec..6da6f6c 100644
--- a/src/mainwindow/widgets/navigationbar.cpp
+++ b/src/mainwindow/widgets/navigationbar.cpp
@@ -29,7 +29,7 @@ NavigationBar::NavigationBar(QWidget *parent)
 
     // Back button
     backAction = addAction(Util::icon(QStyle::SP_ArrowBack), tr("Back"));
-    config.shortcut<QAction>(*backAction, "shortcuts.navigation.back");
+    config.shortcut<QAction>(*backAction, "shortcuts/navigation.back");
     connect(backAction, &QAction::triggered, this, [this]() {
         m_view->history()->back();
     });
@@ -47,7 +47,7 @@ NavigationBar::NavigationBar(QWidget *parent)
     });
     backAction->setMenu(backMenu);
 
-    auto *backMenuShortcut = new QShortcut(QKeySequence(config.value<QString>("shortcuts.navigation.backmenu").value()), this);
+    auto *backMenuShortcut = new QShortcut(QKeySequence(config.value<QString>("shortcuts/navigation.backmenu").value()), this);
     connect(backMenuShortcut, &QShortcut::activated, backMenu, [this, backMenu]() {
         if(backAction->isEnabled()) {
             auto *widget = this->widgetForAction(backAction);
@@ -57,7 +57,7 @@ NavigationBar::NavigationBar(QWidget *parent)
 
     // Forward button
     forwardAction = addAction(Util::icon(QStyle::SP_ArrowForward), tr("Forward"));
-    config.shortcut<QAction>(*forwardAction, "shortcuts.navigation.forward");
+    config.shortcut<QAction>(*forwardAction, "shortcuts/navigation.forward");
     connect(forwardAction, &QAction::triggered, this, [this]() {
         m_view->history()->forward();
     });
@@ -75,7 +75,7 @@ NavigationBar::NavigationBar(QWidget *parent)
     });
     forwardAction->setMenu(forwardMenu);
 
-    auto *forwardMenuShortcut = new QShortcut(QKeySequence(config.value<QString>("shortcuts.navigation.forwardmenu").value()), this);
+    auto *forwardMenuShortcut = new QShortcut(QKeySequence(config.value<QString>("shortcuts/navigation.forwardmenu").value()), this);
     connect(forwardMenuShortcut, &QShortcut::activated, forwardMenu, [this, forwardMenu]() {
         if(forwardAction->isEnabled()) {
             auto *widget = this->widgetForAction(forwardAction);
@@ -85,7 +85,7 @@ NavigationBar::NavigationBar(QWidget *parent)
 
     // Stop/Refresh button
     stopReloadAction = addAction(Util::icon(QStyle::SP_BrowserReload), tr("Refresh"));
-    config.shortcut<QAction>(*stopReloadAction, "shortcuts.navigation.refresh");
+    config.shortcut<QAction>(*stopReloadAction, "shortcuts/navigation.refresh");
     connect(stopReloadAction, &QAction::triggered, this, [this]() {
         if(m_view->isLoaded())
             m_view->reload();
@@ -93,14 +93,14 @@ NavigationBar::NavigationBar(QWidget *parent)
             m_view->stop();
     });
 
-    auto *reloadShortcut = new QShortcut(QKeySequence(config.value<QString>("shortcuts.navigation.reload").value()), this);
+    auto *reloadShortcut = new QShortcut(QKeySequence(config.value<QString>("shortcuts/navigation.reload").value()), this);
     connect(reloadShortcut, &QShortcut::activated, this, [this]() {
         m_view->triggerPageAction(QWebEnginePage::ReloadAndBypassCache);
     });
 
     // Home button
     homeAction = addAction(Util::icon(QStyle::SP_DirHomeIcon), tr("Home"));
-    config.shortcut<QAction>(*homeAction, "shortcuts.navigation.home");
+    config.shortcut<QAction>(*homeAction, "shortcuts/navigation.home");
     connect(homeAction, &QAction::triggered, this, [this]() {
         m_view->load(m_view->profile()->homepage());
     });
diff --git a/src/mainwindow/widgets/searchform.cpp b/src/mainwindow/widgets/searchform.cpp
index e10933b..af54f5c 100644
--- a/src/mainwindow/widgets/searchform.cpp
+++ b/src/mainwindow/widgets/searchform.cpp
@@ -10,6 +10,7 @@
 #include "ui_searchform.h"
 #include <QHideEvent>
 #include <QShowEvent>
+#include <QWebEngineFindTextResult>
 #include <QWebEngineView>
 
 SearchForm::SearchForm(QWidget *parent)
@@ -26,7 +27,8 @@ SearchForm::SearchForm(QWidget *parent)
             QWebEnginePage::FindFlags searchFlags;
             searchFlags.setFlag(QWebEnginePage::FindCaseSensitively, ui->caseSensitivity_checkBox->isChecked());
             searchFlags.setFlag(QWebEnginePage::FindBackward, ui->reverseSearch_checkBox->isChecked());
-            m_view->findText(ui->lineEdit->text(), searchFlags, [this](bool found) {
+            m_view->findText(ui->lineEdit->text(), searchFlags, [this](const QWebEngineFindTextResult &result) {
+                const bool found = result.numberOfMatches() > 0;
                 ui->result_label->setVisible(!found);
             });
         }