diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-03 19:24:17 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-03 19:24:17 +0000 |
| commit | 76004bcedbaac2cd7fe009767d1f4875648c8690 (patch) | |
| tree | 8a694588c94c2118aff8427a531ee5a80ce08f57 /src/webenginewidgets | |
| parent | b355aa1c02338a0d9c38beceb2cf8bc7d59f101a (diff) | |
| parent | e6c64fa060906997af46d42f8ce768be9449534d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/webenginewidgets')
| -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()) |