mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-21 17:15:09 -07:00
[CI] Remove Qt5 (#7071)
* [CI] Remove Qt5 Took 10 minutes Took 9 minutes * Revert CI failure and fix up comments Took 4 minutes --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
parent
59d90db3c7
commit
c4316c40e9
60 changed files with 103 additions and 555 deletions
|
|
@ -580,11 +580,7 @@ void ChatView::redactMessages(const QString &userName, int amount)
|
|||
}
|
||||
}
|
||||
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||
void ChatView::enterEvent(QEnterEvent * /*event*/)
|
||||
#else
|
||||
void ChatView::enterEvent(QEvent * /*event*/)
|
||||
#endif
|
||||
{
|
||||
setMouseTracking(true);
|
||||
}
|
||||
|
|
@ -641,12 +637,9 @@ void ChatView::mousePressEvent(QMouseEvent *event)
|
|||
{
|
||||
switch (hoveredItemType) {
|
||||
case HoveredCard: {
|
||||
if ((event->button() == Qt::MiddleButton) || (event->button() == Qt::LeftButton))
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||
if ((event->button() == Qt::MiddleButton) || (event->button() == Qt::LeftButton)) {
|
||||
emit showCardInfoPopup(event->globalPosition().toPoint(), {hoveredContent});
|
||||
#else
|
||||
emit showCardInfoPopup(event->globalPos(), {hoveredContent});
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
}
|
||||
case HoveredUser: {
|
||||
|
|
@ -656,11 +649,7 @@ void ChatView::mousePressEvent(QMouseEvent *event)
|
|||
switch (event->button()) {
|
||||
case Qt::RightButton: {
|
||||
UserLevelFlags userLevel(hoveredContent.left(delimiterIndex).toInt());
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||
userContextMenu->showContextMenu(event->globalPosition().toPoint(), userName, userLevel, this);
|
||||
#else
|
||||
userContextMenu->showContextMenu(event->globalPos(), userName, userLevel, this);
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
case Qt::LeftButton: {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue