porting to Qt 6.9.0 and GNU compiler

jmeidow · jmeidow · commit 685914090706 · 2025-05-05T09:38:02.000+02:00
diff --git a/src/greasepad.pro b/src/greasepad.pro
@@ -17,6 +17,11 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
+
+# set assember's flags (MinGW), syntax: -Wa,<comma-separated list>
+QMAKE_CXXFLAGS += -Wa,-mbig-obj
+
+
 SOURCES += \
     aabb.cpp \
     adjustment.cpp \
diff --git a/src/mainview.cpp b/src/mainview.cpp
@@ -56,7 +56,8 @@ void MainView::wheelEvent( QWheelEvent *event )
     // restricted zooming [0.1, 10]
     const qreal lod = QStyleOptionGraphicsItem::levelOfDetailFromTransform(transform());
 
-    double s = event->delta() > 0 ? zoom_out : zoom_in;
+    // double s = event->delta() > 0 ? zoom_out : zoom_in;  // old Qt version
+    double s = event->angleDelta().y() > 0 ? zoom_out : zoom_in;
 
     setTransformationAnchor( QGraphicsView::AnchorUnderMouse );
     // qDebug() << s << lod;
diff --git a/src/qconstraints.cpp b/src/qconstraints.cpp
@@ -28,6 +28,8 @@
 #include <QPainter>
 #include <qstyleoption.h>
 
+#include <cfloat>
+
 
 namespace QConstraint {
 
diff --git a/src/statistics.h b/src/statistics.h
@@ -19,8 +19,9 @@
 #ifndef STATISTICS_H
 #define STATISTICS_H
 
-#include <limits>
 #include <cassert>
+#include <cfloat>
+#include <cmath>
 
 //! Parametric probability distributions
 namespace Stats {
diff --git a/src/uncertain.h b/src/uncertain.h
@@ -21,6 +21,8 @@
 
 #include <Eigen/Dense>
 
+#include <cfloat>
+
 //! Uncertain geometric entities
 namespace Uncertain {
 
