diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-29 13:04:09 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-29 13:04:31 +0200 |
commit | e6c64fa060906997af46d42f8ce768be9449534d (patch) | |
tree | 0170d8ab4f26b686263ea8a5a0ee1f6b540628cd /src/webenginewidgets/api/qwebenginepage.cpp | |
parent | 42a422ff035d51f5a20e7b0024ea30e764b92097 (diff) | |
parent | 8575d9aa489f4c9e839e3cb28b9f8c27acbdb425 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I922e637ffbf03aa15711fa5d0e10ecd4f25448ab
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 54989caaf..447c53ba9 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -815,6 +815,10 @@ QAction *QWebEnginePage::action(WebAction action) const text = tr("Reload"); icon = style->standardIcon(QStyle::SP_BrowserReload); break; + case ReloadAndBypassCache: + text = tr("Reload and Bypass Cache"); + icon = style->standardIcon(QStyle::SP_BrowserReload); + break; case Cut: text = tr("Cut"); break; @@ -896,7 +900,9 @@ QAction *QWebEnginePage::action(WebAction action) const case SavePage: text = tr("Save &Page"); break; - default: + case NoWebAction: + case WebActionCount: + Q_UNREACHABLE(); break; } @@ -1084,8 +1090,11 @@ void QWebEnginePage::triggerAction(WebAction action, bool) case SavePage: d->adapter->save(); break; - default: + case NoWebAction: + break; + case WebActionCount: Q_UNREACHABLE(); + break; } } @@ -1157,11 +1166,10 @@ bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData QMenu::exec(view->actions(), event.globalPos(), 0, view); break; } - // fall through - default: + // fallthrough + case Qt::NoContextMenu: event.ignore(); return false; - break; } view->d_func()->m_pendingContextMenuEvent = false; return true; @@ -1210,8 +1218,6 @@ void QWebEnginePagePrivate::javascriptDialog(QSharedPointer<JavaScriptDialogCont case InternalAuthorizationDialog: accepted = (QMessageBox::question(view, controller->title(), controller->message(), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes); break; - default: - Q_UNREACHABLE(); } if (accepted) controller->accept(); @@ -1397,7 +1403,7 @@ void QWebEnginePage::setFeaturePermission(const QUrl &securityOrigin, QWebEngine else d->adapter->grantMouseLockPermission(false); break; - default: + case Notifications: break; } } @@ -1603,7 +1609,6 @@ QStringList QWebEnginePage::chooseFiles(FileSelectionMode mode, const QStringLis if (!str.isNull()) ret << str; break; - default: case FilePickerController::Open: str = QFileDialog::getOpenFileName(view(), QString(), oldFiles.first()); if (!str.isNull()) |