jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-20 09:22:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Timer & Builds on Qt5

Browse source
This commit is contained in:
Zach Halpern 2024-11-25 13:34:29 -05:00 • committed by ZeldaZach
parent facb9a030f
commit cc4f8a4761
No known key found for this signature in database
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp
View file

@ -48,7 +48,11 @@ AllZonesCardAmountWidget::AllZonesCardAmountWidget(QWidget *parent,
setMouseTracking(true); setMouseTracking(true);
} }
void AllZonesCardAmountWidget::enterEvent(QEnterEvent *event) #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
void AllZonesCardAmountWidget::enterEvent(QEnterEvent *event) override
#else
void AllZonesCardAmountWidget::enterEvent(QEvent *event) override
#endif
{ {
QWidget::enterEvent(event); QWidget::enterEvent(event);
update(); update();

2
cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp
View file

@ -105,6 +105,7 @@ void PrintingSelector::updateSortOrder()
void PrintingSelector::updateDisplay() void PrintingSelector::updateDisplay()
{ {
timer->stop(); timer->stop();
timer->deleteLater();
timer = new QTimer(this); timer = new QTimer(this);
flowWidget->clearLayout(); flowWidget->clearLayout();
if (selectedCard != nullptr) { if (selectedCard != nullptr) {
@ -316,7 +317,6 @@ void PrintingSelector::getAllSetsForCurrentCard()
// Stop timer when done // Stop timer when done
if (currentIndex >= prependedSets.size()) { if (currentIndex >= prependedSets.size()) {
timer->stop(); timer->stop();
timer->deleteLater();
} }
}); });
currentIndex = 0; currentIndex = 0;