diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-09-16 10:50:47 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-23 12:26:52 +0200 |
commit | 0e1372d95939d3bd3889100fbec10036d7a83f1f (patch) | |
tree | a86a53db4ff36857a1373265b896745d538ce98f /examples/webenginewidgets/simplebrowser/browserwindow.cpp | |
parent | b2a329d3e136a847a352b5f894ce27bd38abe61c (diff) |
Fix compilation after 757a9c21c1 in base
Adaptations for the following qtbase changes:
- acbf9a858b Cleanup QTypeInfo
- 652bd1efca Make QStringList an alias to QList<QString>
- 25351dcc54 Long live QKeyCombination!
- ed8acbeb7c Automatically register data/debug stream operations in QMetaType
- a735038376 Move QStateMachine from QtCore to QtScxml
Change-Id: Ieb2677cd0572cc6dfe7be4b8f8dd4189a39bd3fe
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'examples/webenginewidgets/simplebrowser/browserwindow.cpp')
-rw-r--r-- | examples/webenginewidgets/simplebrowser/browserwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/webenginewidgets/simplebrowser/browserwindow.cpp b/examples/webenginewidgets/simplebrowser/browserwindow.cpp index f34fd79c4..26639117c 100644 --- a/examples/webenginewidgets/simplebrowser/browserwindow.cpp +++ b/examples/webenginewidgets/simplebrowser/browserwindow.cpp @@ -341,7 +341,7 @@ QToolBar *BrowserWindow::createToolBar() QList<QKeySequence> backShortcuts = QKeySequence::keyBindings(QKeySequence::Back); for (auto it = backShortcuts.begin(); it != backShortcuts.end();) { // Chromium already handles navigate on backspace when appropriate. - if ((*it)[0] == Qt::Key_Backspace) + if ((*it)[0].key() == Qt::Key_Backspace) it = backShortcuts.erase(it); else ++it; @@ -360,7 +360,7 @@ QToolBar *BrowserWindow::createToolBar() m_historyForwardAction = new QAction(this); QList<QKeySequence> fwdShortcuts = QKeySequence::keyBindings(QKeySequence::Forward); for (auto it = fwdShortcuts.begin(); it != fwdShortcuts.end();) { - if (((*it)[0] & Qt::Key_unknown) == Qt::Key_Backspace) + if (((*it)[0].key() & Qt::Key_unknown) == Qt::Key_Backspace) it = fwdShortcuts.erase(it); else ++it; |