From cc4f8a4761c82daaee064e43c3a8519a56a4fe15 Mon Sep 17 00:00:00 2001
From: Zach Halpern <zahalpern+github@gmail.com>
Date: Mon, 25 Nov 2024 13:34:29 -0500
Subject: [PATCH] Fix Timer & Builds on Qt5

---
 .../printing_selector/all_zones_card_amount_widget.cpp      | 6 +++++-
 .../ui/widgets/printing_selector/printing_selector.cpp      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cockatrice/src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp b/cockatrice/src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp
index c2a482c8e..04a93b33f 100644
--- a/cockatrice/src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp
@@ -48,7 +48,11 @@ AllZonesCardAmountWidget::AllZonesCardAmountWidget(QWidget *parent,
     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);
     update();
diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp
index 6a149deeb..655c038e0 100644
--- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp
+++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp
@@ -105,6 +105,7 @@ void PrintingSelector::updateSortOrder()
 void PrintingSelector::updateDisplay()
 {
     timer->stop();
+    timer->deleteLater();
     timer = new QTimer(this);
     flowWidget->clearLayout();
     if (selectedCard != nullptr) {
@@ -316,7 +317,6 @@ void PrintingSelector::getAllSetsForCurrentCard()
         // Stop timer when done
         if (currentIndex >= prependedSets.size()) {
             timer->stop();
-            timer->deleteLater();
         }
     });
     currentIndex = 0;