Commit 482cc792 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

operator+/- is disabled for QFlags in qt6

parent 184c146e
......@@ -207,8 +207,8 @@ QAction* ParleyActions::createDownloadAction(const QObject* recvr, const char* s
collection->addAction(QStringLiteral("file_ghns"), pAction);
QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot);
pAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_G));
collection->setDefaultShortcut(pAction, QKeySequence(Qt::CTRL + Qt::Key_G));
pAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_G));
collection->setDefaultShortcut(pAction, QKeySequence(Qt::CTRL | Qt::Key_G));
pAction->setToolTip(i18n("Downloads new vocabulary collections"));
return pAction;
}
......
......@@ -90,7 +90,7 @@ void PracticeMainWindow::initActions()
toggleAnswerState->setText(i18n("Change answer to right/wrong"));
toggleAnswerState->setToolTip(i18n("When you answered, Parley will display that the answer was right or wrong.\nThis shortcut changes how the answer is counted."));
actionCollection()->addAction(QStringLiteral("toggle_answer_state"), toggleAnswerState);
toggleAnswerState->setShortcut(Qt::CTRL + Qt::Key_Space);
toggleAnswerState->setShortcut(Qt::CTRL | Qt::Key_Space);
connect(toggleAnswerState, &QAction::triggered, m_guiFrontend, &GuiFrontend::toggleResultState);
//m_floatingToolBar now a child of m_mainWindow and will be deleted with its parent
......
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