]> granicus.if.org Git - graphviz/commitdiff
gvedit CMainWindow::actions: use '|' instead of '+' to combine QKeyCombinations
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Sat, 31 Dec 2022 00:11:17 +0000 (16:11 -0800)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Sat, 31 Dec 2022 17:24:03 +0000 (09:24 -0800)
`operator+` is deprecated on this type in Qt6 and produces a warning.
`operator|` works in both Qt5 and Qt6.

Gitlab: #2233

cmd/gvedit/mainwindow.cpp

index f4f1bd4c9d03a5e05f45ea249690f78b4fa77722..9756a2fac268f0b518fc3f04fd9466aecc539182 100644 (file)
@@ -539,7 +539,7 @@ void CMainWindow::actions()
        new QAction(QIcon(":/images/settings.png"), tr("Settings"), this);
     settingsAct->setStatusTip(tr("Show Graphviz Settings"));
     connect(settingsAct, SIGNAL(triggered()), this, SLOT(slotSettings()));
-    settingsAct->setShortcut(QKeySequence(Qt::SHIFT + Qt::Key_F5));
+    settingsAct->setShortcut(QKeySequence(Qt::SHIFT | Qt::Key_F5));