diff --git a/src/lib/app/mainmenu.cpp b/src/lib/app/mainmenu.cpp index 6a83ca2fa..89e124d1a 100644 --- a/src/lib/app/mainmenu.cpp +++ b/src/lib/app/mainmenu.cpp @@ -29,7 +29,6 @@ #include "adblockmanager.h" #include "downloadmanager.h" #include "mainapplication.h" -#include "browsinglibrary.h" #include "clearprivatedata.h" #include "qzsettings.h" diff --git a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp index f7ee666fd..077b53a81 100644 --- a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp +++ b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp @@ -269,7 +269,6 @@ QString QupZillaSchemeReply::speeddialPage() if (dPage.isEmpty()) { dPage.append(QzTools::readAllFileContents(":html/speeddial.html")); - dPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:icons/qupzilla.png")); dPage.replace(QLatin1String("%IMG_PLUS%"), QLatin1String("qrc:html/plus.png")); dPage.replace(QLatin1String("%IMG_CLOSE%"), QLatin1String("qrc:html/close.png")); dPage.replace(QLatin1String("%IMG_EDIT%"), QLatin1String("qrc:html/edit.png")); diff --git a/src/lib/webengine/webview.cpp b/src/lib/webengine/webview.cpp index 4a57cf66b..53c3049c5 100644 --- a/src/lib/webengine/webview.cpp +++ b/src/lib/webengine/webview.cpp @@ -1054,9 +1054,7 @@ void WebView::_keyPressEvent(QKeyEvent *event) return; } - int eventKey = event->key(); - - switch (eventKey) { + switch (event->key()) { case Qt::Key_ZoomIn: zoomIn(); event->accept(); @@ -1183,5 +1181,21 @@ bool WebView::eventFilter(QObject *obj, QEvent *event) } } + // Block already handled events + if (obj == this) { + switch (event->type()) { + case QEvent::KeyPress: + case QEvent::KeyRelease: + case QEvent::MouseButtonPress: + case QEvent::MouseButtonRelease: + case QEvent::MouseMove: + case QEvent::Wheel: + return true; + + default: + break; + } + } + return QWebEngineView::eventFilter(obj, event); }