From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 31 Dec 2022 00:11:17 +0000 (-0800)
Subject: gvedit CMainWindow::actions: use '|' instead of '+' to combine QKeyCombinations
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5663d2742659b1b139bd1f95e3fbc025865418c;p=graphviz

gvedit CMainWindow::actions: use '|' instead of '+' to combine QKeyCombinations

`operator+` is deprecated on this type in Qt6 and produces a warning.
`operator|` works in both Qt5 and Qt6.

Gitlab: #2233
---

diff --git a/cmd/gvedit/mainwindow.cpp b/cmd/gvedit/mainwindow.cpp
index f4f1bd4c9..9756a2fac 100644
--- a/cmd/gvedit/mainwindow.cpp
+++ b/cmd/gvedit/mainwindow.cpp
@@ -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));