From bdb3387bff4abe84f300ba2fb2a721f75eb01dda Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 22 Jul 2025 19:18:12 +0200
Subject: [PATCH] Install gcovr via pipx and disable Werror when building
 Benchmarks

---
 .gitlab-ci.yml                               | 4 ++++
 CI/install_debian_deps.sh                    | 2 +-
 apps/opencs/view/render/worldspacewidget.cpp | 2 +-
 extern/CMakeLists.txt                        | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94e8866a40..1bf66930e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -317,10 +317,14 @@ Ubuntu_GCC_tests_coverage:
   extends: .Ubuntu_GCC_tests_Debug
   cache:
     key: Ubuntu_GCC_tests_coverage.ubuntu_24.04.v1
+    paths:
+      - .cache/pip
   variables:
     BUILD_WITH_CODE_COVERAGE: 1
+    PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
   before_script:
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic openmw-coverage
+    - pipx install gcovr
   coverage: /^\s*lines:\s*\d+.\d+\%/
   artifacts:
     paths: []
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 79e759b871..4f0e7cdb69 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -57,7 +57,7 @@ declare -rA GROUPED_DEPS=(
     libsdl2-dev libboost-system-dev libboost-filesystem-dev libgl-dev
   "
 
-  [openmw-coverage]="gcovr"
+  [openmw-coverage]="pipx"
 
   [openmw-integration-tests]="
     ca-certificates
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 6254017ec2..836f5ff0ea 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -735,7 +735,7 @@ void CSVRender::WorldspaceWidget::mouseMoveEvent(QMouseEvent* event)
             }
         }
 
-        const QPointF& pos = event->localPos();
+        QPoint pos = event->position().toPoint();
         handleMarkerHighlight(pos.x(), pos.y());
         SceneWidget::mouseMoveEvent(event);
     }
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 74ba957813..ef39dc20e1 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -209,6 +209,7 @@ if (BUILD_BENCHMARKS AND NOT OPENMW_USE_SYSTEM_BENCHMARK)
     set(BENCHMARK_ENABLE_TESTING OFF)
     set(BENCHMARK_ENABLE_INSTALL OFF)
     set(BENCHMARK_ENABLE_GTEST_TESTS OFF)
+    set(BENCHMARK_ENABLE_WERROR OFF)
 
     include(FetchContent)
     FetchContent_Declare(benchmark