diff options
Diffstat (limited to 'examples/webenginewidgets')
-rw-r--r-- | examples/webenginewidgets/printme/main.cpp | 4 | ||||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/browserwindow.cpp | 4 | ||||
-rw-r--r-- | examples/webenginewidgets/stylesheetbrowser/main.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/examples/webenginewidgets/printme/main.cpp b/examples/webenginewidgets/printme/main.cpp index e4d6d9dc8..212faf12e 100644 --- a/examples/webenginewidgets/printme/main.cpp +++ b/examples/webenginewidgets/printme/main.cpp @@ -66,8 +66,8 @@ int main(int argc, char *argv[]) PrintHandler handler; handler.setPage(view.page()); - auto printPreviewShortCut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_P), &view); - auto printShortCut = new QShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_P), &view); + auto printPreviewShortCut = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_P), &view); + auto printShortCut = new QShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_P), &view); QObject::connect(printPreviewShortCut, &QShortcut::activated, &handler, &PrintHandler::printPreview); QObject::connect(printShortCut, &QShortcut::activated, &handler, &PrintHandler::print); 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; diff --git a/examples/webenginewidgets/stylesheetbrowser/main.cpp b/examples/webenginewidgets/stylesheetbrowser/main.cpp index 833ea6bb0..9cd294d48 100644 --- a/examples/webenginewidgets/stylesheetbrowser/main.cpp +++ b/examples/webenginewidgets/stylesheetbrowser/main.cpp @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) { - qRegisterMetaTypeStreamOperators<StyleSheet>("StyleSheet"); + qRegisterMetaType<StyleSheet>("StyleSheet"); QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); |