diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-30 15:09:37 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-02 14:55:35 +0100 |
| commit | 2f5c2b99df443aa167c35e37e485b27645bfbe49 (patch) | |
| tree | 65cb00b5021ff09fd392d386d3e739fa09f05ead | |
| parent | 0ca6837ad76eb23a0e7c5f9981fdb5b8827a0a3e (diff) | |
Update dependencies
Fix deprecation warnings about QKeySequence.
Change-Id: I37d40ee3e5e12a6ade0ccc6317c17ba56ef8b6c7
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | dependencies.yaml | 4 | ||||
| -rw-r--r-- | tests/manual/imageconversion/main.cpp | 4 | ||||
| -rw-r--r-- | tests/manual/thumbnail/main.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index a70c014..f8d3fe1 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 2d0a5f7a014d1b84d5701d835aa28f1a047fbff5 + ref: 4c36d64bb3a4425848de3f134a8caca3e8d20fe3 required: true ../qtdeclarative: - ref: b4a0e5ac8d6bd2531267c51bb84c9ea53ad87302 + ref: db9543cff7ac115beb9317f3ab6275c8609941b6 required: false diff --git a/tests/manual/imageconversion/main.cpp b/tests/manual/imageconversion/main.cpp index 5404348..d2899f2 100644 --- a/tests/manual/imageconversion/main.cpp +++ b/tests/manual/imageconversion/main.cpp @@ -262,7 +262,7 @@ void PaintWidget::contextMenuEvent(QContextMenuEvent *e) QMenu contextMenu; contextMenu.addAction(QStringLiteral("Convert into QImage"), this, &PaintWidget::convertBack); QAction *saveAction = contextMenu.addAction(QStringLiteral("Save"), this, &PaintWidget::saveBitmap); - saveAction->setShortcut(Qt::CTRL + Qt::Key_S); + saveAction->setShortcut(Qt::CTRL | Qt::Key_S); contextMenu.exec(e->globalPos()); } @@ -381,7 +381,7 @@ int main(int argc, char *argv[]) { PaintWidget paintWidget(bitmap); auto *quitShortcut = new QShortcut(&paintWidget); - quitShortcut->setKey(Qt::CTRL + Qt::Key_Q); + quitShortcut->setKey(Qt::CTRL | Qt::Key_Q); quitShortcut->setContext(Qt::ApplicationShortcut); QObject::connect(quitShortcut, &QShortcut::activated, qApp, &QCoreApplication::quit); paintWidget.setWindowTitle(QLatin1String("HBITMAP - Qt ") + QLatin1String(QT_VERSION_STR)); diff --git a/tests/manual/thumbnail/main.cpp b/tests/manual/thumbnail/main.cpp index 8266a0a..8c2eeec 100644 --- a/tests/manual/thumbnail/main.cpp +++ b/tests/manual/thumbnail/main.cpp @@ -96,7 +96,7 @@ MainWindow::MainWindow() fileMenu->addAction(m_enableIconicPixmapAction); fileMenu->addAction(m_enableIconicLivePreviewAction); QAction *quitAction = fileMenu->addAction("&Quit"); - quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); + quitAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Q)); connect(quitAction, &QAction::triggered, QCoreApplication::quit); setCentralWidget(m_logEdit); } |