Import Geant4 11.4.1 source tree

source/visualization/OpenGL/History

@@ -5,6 +5,19 @@ which **must** added in reverse chronological order (newest at the top).
 It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
+
+## 2026-02-01 John Allison (opengl-V11-03-10)
+- G4OpenGLViewer.cc:
+  - Remove archaic and unnecessary 20th-century #include statements. The first
+    raises a warning on some platforms.
+    - #include "G4ios.hh"
+    - #include <CLHEP/Units/SystemOfUnits.h>
+
+## 2025-12-26 John Allison
+- G4OpenGLQtViewer.cc: Fix bug 2688: 
+  - In G4OpenGLQtViewer::G4wheelEvent:
+    - Fix for Qt version < 5.14.
+
 ## 2025-10-31 Andrea Barresi (opengl-V11-03-09)
 - G4OpenGLQtViewer
   - Improved context menu behavior for picking

source/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -1556,7 +1556,11 @@ void G4OpenGLQtViewer::G4wheelEvent (QWheelEvent * evnt)
   double delta = evnt->angleDelta().y();
 #endif
 
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+  ZoomFromMouseWheel(delta, evnt->modifiers() & Qt::ShiftModifier, evnt->pos().x(), evnt->pos().y());
+#else
   ZoomFromMouseWheel(delta, evnt->modifiers() & Qt::ShiftModifier, evnt->position().x(), evnt->position().y());
+#endif
 
   updateQWidget();
 }

source/visualization/OpenGL/src/G4OpenGLViewer.cc

@@ -29,8 +29,6 @@
 // Andrew Walkden  27th March 1996
 // OpenGL view - opens window, hard copy, etc.
 
-#include "G4ios.hh"
-#include <CLHEP/Units/SystemOfUnits.h>
 #include "G4OpenGLViewer.hh"
 #include "G4OpenGLSceneHandler.hh"
 #include "G4OpenGLTransform3D.hh"