diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-04-07 11:56:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-15 13:55:53 +0200 |
| commit | e545ecaf29779950c0c91aa4b5e179b650e7ac8c (patch) | |
| tree | 2bacddbacf3ad6c4bb810e229df3e114f68018cc /examples | |
| parent | 4d1d33022a431c3108c4eb33a60d23b0f013d9b8 (diff) | |
Update QWebEnginePage::WebWindowType
Expose the same values as currently available in
QQuickWebEngineView::NewViewDestination.
Rename the WebModalDialog to WebDialog, which actually replaces the
tool/status/menuBarVisibilityChangeRequested signals.
Change-Id: Icc103f434fb3eca49f1a53e476e101c3d6fffd36
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/webenginewidgets/browser/webview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/examples/webenginewidgets/browser/webview.cpp b/examples/webenginewidgets/browser/webview.cpp index 193cb4797..6fdf316bd 100644 --- a/examples/webenginewidgets/browser/webview.cpp +++ b/examples/webenginewidgets/browser/webview.cpp @@ -175,11 +175,10 @@ QWebEnginePage *WebPage::createWindow(QWebEnginePage::WebWindowType type) { if (m_keyboardModifiers & Qt::ControlModifier || m_pressedButtons == Qt::MidButton) m_openInNewTab = true; - if (m_openInNewTab) { + if (m_openInNewTab || type == QWebEnginePage::WebBrowserTab) { m_openInNewTab = false; return mainWindow()->tabWidget()->newTab()->page(); - } - if (type == QWebEnginePage::WebBrowserWindow) { + } else if (type == QWebEnginePage::WebBrowserWindow) { BrowserApplication::instance()->newMainWindow(); BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow(); return mainWindow->currentTab()->page(); |