6 files changed, 29 insertions, 34 deletions

diff --git a/examples/webengine/quicknanobrowser/quickwindow.qml b/examples/webengine/quicknanobrowser/quickwindow.qml
index 610144dca..b954629fb 100644
--- a/examples/webengine/quicknanobrowser/quickwindow.qml
+++ b/examples/webengine/quicknanobrowser/quickwindow.qml
@@ -93,6 +93,18 @@ ApplicationWindow {
                 tabs.removeTab(tabs.currentIndex)
         }
     }
+    Action {
+        shortcut: "Ctrl+0"
+        onTriggered: currentWebView.zoomFactor = 1.0;
+    }
+    Action {
+        shortcut: "Ctrl+-"
+        onTriggered: currentWebView.zoomFactor -= 0.1;
+    }
+    Action {
+        shortcut: "Ctrl+="
+        onTriggered: currentWebView.zoomFactor += 0.1;
+    }
 
     toolBar: ToolBar {
         id: navigationBar
diff --git a/examples/webengine/quicknanobrowser/util.h b/examples/webengine/quicknanobrowser/util.h
index bc1cf8beb..ca0f5f1d5 100644
--- a/examples/webengine/quicknanobrowser/util.h
+++ b/examples/webengine/quicknanobrowser/util.h
@@ -50,7 +50,7 @@ QUrl urlFromUserInput(const QString& userInput)
 {
     QFileInfo fileInfo(userInput);
     if (fileInfo.exists())
-        return QUrl(fileInfo.absoluteFilePath());
+        return QUrl::fromLocalFile(fileInfo.absoluteFilePath());
     return QUrl::fromUserInput(userInput);
 }
 
diff --git a/examples/webenginewidgets/browser/featurepermissionbar.cpp b/examples/webenginewidgets/browser/featurepermissionbar.cpp
index 98f19ad1f..a47cbcd9e 100644
--- a/examples/webenginewidgets/browser/featurepermissionbar.cpp
+++ b/examples/webenginewidgets/browser/featurepermissionbar.cpp
@@ -80,12 +80,13 @@ FeaturePermissionBar::FeaturePermissionBar(QWidget *view)
     l->addStretch();
     QPushButton *allowButton = new QPushButton(tr("Allow"), this);
     QPushButton *denyButton = new QPushButton(tr("Deny"), this);
+    QPushButton *discardButton = new QPushButton(QIcon(QStringLiteral(":closetab.png")), QString(), this);
     connect(allowButton, &QPushButton::clicked, this, &FeaturePermissionBar::permissionGranted);
     connect(denyButton, &QPushButton::clicked, this, &FeaturePermissionBar::permissionDenied);
-    QPushButton *discardButton = new QPushButton(QIcon(QStringLiteral(":closetab.png")), QString(), this);
-    connect(discardButton, &QPushButton::clicked, this, &QObject::deleteLater);
+    connect(discardButton, &QPushButton::clicked, this, &FeaturePermissionBar::permissionUnknown);
     connect(allowButton, &QPushButton::clicked, this, &QObject::deleteLater);
     connect(denyButton, &QPushButton::clicked, this, &QObject::deleteLater);
+    connect(discardButton, &QPushButton::clicked, this, &QObject::deleteLater);
     l->addWidget(denyButton);
     l->addWidget(allowButton);
     l->addWidget(discardButton);
@@ -118,3 +119,8 @@ void FeaturePermissionBar::permissionGranted()
 {
     emit featurePermissionProvided(m_securityOrigin, m_feature, QWebEnginePage::PermissionGrantedByUser);
 }
+
+void FeaturePermissionBar::permissionUnknown()
+{
+    emit featurePermissionProvided(m_securityOrigin, m_feature, QWebEnginePage::PermissionUnknown);
+}
diff --git a/examples/webenginewidgets/browser/featurepermissionbar.h b/examples/webenginewidgets/browser/featurepermissionbar.h
index 92ca04773..cee5a25b0 100644
--- a/examples/webenginewidgets/browser/featurepermissionbar.h
+++ b/examples/webenginewidgets/browser/featurepermissionbar.h
@@ -63,6 +63,7 @@ signals:
 private slots:
     void permissionDenied();
     void permissionGranted();
+    void permissionUnknown();
 
 private:
     QWebEnginePage::Feature m_feature;
diff --git a/examples/webenginewidgets/browser/webview.cpp b/examples/webenginewidgets/browser/webview.cpp
index 5ea273e3a..9b42f2ab2 100644
--- a/examples/webenginewidgets/browser/webview.cpp
+++ b/examples/webenginewidgets/browser/webview.cpp
@@ -97,37 +97,15 @@ BrowserMainWindow *WebPage::mainWindow()
     return BrowserApplication::instance()->mainWindow();
 }
 
-#if defined(QWEBENGINEPAGE_ACCEPTNAVIGATIONREQUEST)
-bool WebPage::acceptNavigationRequest(QWebEngineFrame *frame, const QNetworkRequest &request, NavigationType type)
+bool WebPage::acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame)
 {
-    // ctrl open in new tab
-    // ctrl-shift open in new tab and select
-    // ctrl-alt open in new window
-    if (type == QWebEnginePage::NavigationTypeLinkClicked
-        && (m_keyboardModifiers & Qt::ControlModifier
-            || m_pressedButtons == Qt::MidButton)) {
-        bool newWindow = (m_keyboardModifiers & Qt::AltModifier);
-        WebView *webView;
-        if (newWindow) {
-            BrowserApplication::instance()->newMainWindow();
-            BrowserMainWindow *newMainWindow = BrowserApplication::instance()->mainWindow();
-            webView = newMainWindow->currentTab();
-            newMainWindow->raise();
-            newMainWindow->activateWindow();
-            webView->setFocus();
-        } else {
-            bool selectNewTab = (m_keyboardModifiers & Qt::ShiftModifier);
-            webView = mainWindow()->tabWidget()->newTab(selectNewTab);
-        }
-        webView->load(request);
-        m_keyboardModifiers = Qt::NoModifier;
-        m_pressedButtons = Qt::NoButton;
-        return false;
+    Q_UNUSED(type);
+    if (isMainFrame) {
+        m_loadingUrl = url;
+        emit loadingUrl(m_loadingUrl);
     }
-    m_loadingUrl = request.url();
-    emit loadingUrl(m_loadingUrl);
+    return true;
 }
-#endif
 
 bool WebPage::certificateError(const QWebEngineCertificateError &error)
 {
diff --git a/examples/webenginewidgets/browser/webview.h b/examples/webenginewidgets/browser/webview.h
index 2cedeb79b..5ed674f6a 100644
--- a/examples/webenginewidgets/browser/webview.h
+++ b/examples/webenginewidgets/browser/webview.h
@@ -65,9 +65,7 @@ public:
     BrowserMainWindow *mainWindow();
 
 protected:
-#if defined(QWEBENGINEPAGE_ACCEPTNAVIGATIONREQUEST)
-    bool acceptNavigationRequest(QWebEngineFrame *frame, const QNetworkRequest &request, NavigationType type);
-#endif
+    bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame);
     QWebEnginePage *createWindow(QWebEnginePage::WebWindowType type);
 #if !defined(QT_NO_UITOOLS)
     QObject *createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);