Commit 2ff46924 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

operator+/- is disabled for QFlags in qt6

parent ae77b14e
Pipeline #43363 canceled with stage
......@@ -51,19 +51,19 @@ void SieveEditorMenuBar::initActions()
{
mGoToLine = new QAction(i18n("Go to Line"), this);
mGoToLine->setIcon(QIcon::fromTheme(QStringLiteral("go-jump")));
mGoToLine->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_G));
mGoToLine->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_G));
connect(mGoToLine, &QAction::triggered, this, &SieveEditorMenuBar::gotoLine);
mCommentCodeAction = new QAction(i18n("Comment"), this);
mCommentCodeAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_D));
mCommentCodeAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_D));
connect(mCommentCodeAction, &QAction::triggered, this, &SieveEditorMenuBar::comment);
mUncommentCodeAction = new QAction(i18n("Uncomment"), this);
mUncommentCodeAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_D));
mUncommentCodeAction->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT + Qt::Key_D));
connect(mUncommentCodeAction, &QAction::triggered, this, &SieveEditorMenuBar::uncomment);
mDebugSieveAction = new QAction(i18n("Debug Sieve Script..."), this);
mDebugSieveAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_D));
mDebugSieveAction->setShortcut(QKeySequence(Qt::ALT | Qt::Key_D));
connect(mDebugSieveAction, &QAction::triggered, this, &SieveEditorMenuBar::debugSieveScript);
mFindAction = KStandardAction::find(this, &SieveEditorMenuBar::find, this);
......
......@@ -73,11 +73,11 @@ SieveTemplateEditDialog::SieveTemplateEditDialog(QWidget *parent, bool defaultTe
connect(mTextEditWidget->textEdit(), &SieveTextEdit::say, textToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say);
auto *shortcut = new QShortcut(this);
shortcut->setKey(Qt::Key_F + Qt::CTRL);
shortcut->setKey(Qt::Key_F | Qt::CTRL);
connect(shortcut, &QShortcut::activated, mTextEditWidget, &SieveTextEditWidget::slotFind);
shortcut = new QShortcut(this);
shortcut->setKey(Qt::Key_R + Qt::CTRL);
shortcut->setKey(Qt::Key_R | Qt::CTRL);
connect(shortcut, &QShortcut::activated, mTextEditWidget, &SieveTextEditWidget::slotReplace);
w->setLayout(vbox);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment