Blame wireshark-0011-Fix-FTBFS-Qt-Color-utils-arm.patch

Peter Hatina fe8eca
diff --git a/ui/qt/color_utils.cpp b/ui/qt/color_utils.cpp
Peter Hatina fe8eca
index e150a14..4fcbe9d 100644
Peter Hatina fe8eca
--- a/ui/qt/color_utils.cpp
Peter Hatina fe8eca
+++ b/ui/qt/color_utils.cpp
Peter Hatina fe8eca
@@ -99,7 +99,7 @@ const color_t ColorUtils::toColorT(const QColor color)
Peter Hatina fe8eca
 
Peter Hatina fe8eca
 QRgb ColorUtils::alphaBlend(const QColor &color1, const QColor &color2, qreal alpha)
Peter Hatina fe8eca
 {
Peter Hatina fe8eca
-    alpha = qBound(0.0, alpha, 1.0);
Peter Hatina fe8eca
+    alpha = qBound<qreal>(0.0, alpha, 1.0);
Peter Hatina fe8eca
 
Peter Hatina fe8eca
     int r1 = color1.red() * alpha;
Peter Hatina fe8eca
     int g1 = color1.green() * alpha;
Peter Hatina fe8eca
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
Peter Hatina fe8eca
index 3c9a616..56dd3ea 100644
Peter Hatina fe8eca
--- a/ui/qt/main_window_slots.cpp
Peter Hatina fe8eca
+++ b/ui/qt/main_window_slots.cpp
Peter Hatina fe8eca
@@ -2226,7 +2226,7 @@ void MainWindow::zoomText()
Peter Hatina fe8eca
     mono_font_ = QFont(wsApp->monospaceFont());
Peter Hatina fe8eca
     qreal zoom_size = wsApp->monospaceFont().pointSize() * 2 * qPow(1.1, recent.gui_zoom_level);
Peter Hatina fe8eca
     zoom_size = qRound(zoom_size) / 2.0;
Peter Hatina fe8eca
-    zoom_size = qMax(zoom_size, 1.0);
Peter Hatina fe8eca
+    zoom_size = qMax<qreal>(zoom_size, 1.0);
Peter Hatina fe8eca
     mono_font_.setPointSizeF(zoom_size);
Peter Hatina fe8eca
     emit monospaceFontChanged(mono_font_);
Peter Hatina fe8eca
 }