Skip to content

Fix missing highlight for Qt 6.10#4511

Merged
Withalion merged 11 commits into
dev/qt-6.10.2from
fix/highlight-6.10
Jun 1, 2026
Merged

Fix missing highlight for Qt 6.10#4511
Withalion merged 11 commits into
dev/qt-6.10.2from
fix/highlight-6.10

Conversation

@Withalion
Copy link
Copy Markdown
Contributor

@Withalion Withalion commented May 22, 2026

Alternative approach to #4506

In Qt 6.9+ instead of triggering onPropertyChanged signal first the value checks for equality. QgsGeometry doesn't have equality operator, but has equals() method instead. We wrap QgsGeometry in MMGeometry class which adds equality operator (this just calls equals()). All QgsGeometry values should be exposed to QML through MMGeometry for bindings to work properly.
In the end we decided to patch QgsGeometry to include equality operator, which calls equals(). Also QgsGeometry has been exposed to QML as qgsGeometry value type.

Just a thought: should we prohibit the usage of QgsGeometry in the app?

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 22, 2026

Coverage Report for CI Build 26752217054

Coverage increased (+0.06%) to 57.837%

Details

  • Coverage increased (+0.06%) from the base build.
  • Patch coverage: No coverable lines changed in this PR.
  • 6 coverage regressions across 2 files.

Uncovered Changes

No uncovered changes found.

Coverage Regressions

6 previously-covered lines in 2 files lost coverage.

File Lines Losing Coverage Coverage
mm/app/position/tracking/positiontrackinghighlight.cpp 4 84.21%
mm/app/multieditmanager.h 2 0.0%

Coverage Stats

Coverage Status
Relevant Lines: 15229
Covered Lines: 8808
Line Coverage: 57.84%
Coverage Strength: 99.06 hits per line

💛 - Coveralls

@github-actions
Copy link
Copy Markdown

📦 Build Artifacts Ready

OS Status Build Info Workflow run
macOS Build 📬 Mergin Maps 68681 dmg Expires: 20/08/2026 #6868
linux Build Build failed or not found. #6888
win64 Build Build failed or not found. #6062
Android Build 📬 Mergin Maps 817811 APK [armeabi-v7a] Expires: 20/08/2026 #8178
📬 Mergin Maps 817811 APK [armeabi-v7a] Google Play Store #8178
Android Build 📬 Mergin Maps 817851 APK [arm64-v8a] Expires: 20/08/2026 #8178
📬 Mergin Maps 817851 APK [arm64-v8a] Google Play Store #8178
iOS Build 📬 Build number: 26.05.912011 #9120

@github-actions
Copy link
Copy Markdown

📦 Build Artifacts Ready

OS Status Build Info Workflow run
macOS Build 📬 Mergin Maps 68681 dmg Expires: 20/08/2026 #6868
linux Build Build failed or not found. #6888
win64 Build 📬 Mergin Maps 60622 win64 Expires: 20/08/2026 #6062
Android Build 📬 Mergin Maps 817811 APK [armeabi-v7a] Expires: 20/08/2026 #8178
📬 Mergin Maps 817811 APK [armeabi-v7a] Google Play Store #8178
Android Build 📬 Mergin Maps 817851 APK [arm64-v8a] Expires: 20/08/2026 #8178
📬 Mergin Maps 817851 APK [arm64-v8a] Google Play Store #8178
iOS Build 📬 Build number: 26.05.912011 #9120

@github-actions
Copy link
Copy Markdown

📦 Build Artifacts Ready

OS Status Build Info Workflow run
macOS Build 📬 Mergin Maps 68681 dmg Expires: 20/08/2026 #6868
linux Build 📬 Mergin Maps 68882 x86_64 Expires: 24/08/2026 #6888
win64 Build 📬 Mergin Maps 60622 win64 Expires: 20/08/2026 #6062
Android Build 📬 Mergin Maps 817811 APK [armeabi-v7a] Expires: 20/08/2026 #8178
📬 Mergin Maps 817811 APK [armeabi-v7a] Google Play Store #8178
Android Build 📬 Mergin Maps 817851 APK [arm64-v8a] Expires: 20/08/2026 #8178
📬 Mergin Maps 817851 APK [arm64-v8a] Google Play Store #8178
iOS Build 📬 Build number: 26.05.912011 #9120

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jun 1, 2026

📦 Build Artifacts Ready

OS Status Build Info Workflow run
macOS Build 📬 Mergin Maps 68701 dmg Expires: 30/08/2026 #6870
linux Build 📬 Mergin Maps 68911 x86_64 Expires: 30/08/2026 #6891
win64 Build 📬 Mergin Maps 60641 win64 Expires: 30/08/2026 #6064
Android Build 📬 Mergin Maps 818011 APK [armeabi-v7a] Expires: 30/08/2026 #8180
📬 Mergin Maps 818011 APK [armeabi-v7a] Google Play Store #8180
Android Build 📬 Mergin Maps 818051 APK [arm64-v8a] Expires: 30/08/2026 #8180
📬 Mergin Maps 818051 APK [arm64-v8a] Google Play Store #8180
iOS Build 📬 Build number: 26.06.912211 #9122

@Withalion Withalion merged commit 1d3a257 into dev/qt-6.10.2 Jun 1, 2026
9 checks passed
@Withalion Withalion deleted the fix/highlight-6.10 branch June 1, 2026 14:23
Withalion added a commit that referenced this pull request Jun 2, 2026
* Initial build for macos and ios

* Fix Bluetooth model syntax

* Update QGIS to 3.44.10

* Format cmake files

* Fix failing Linux build

* Add log to Linux CI

* Install mono on linux CI

* Remove mono from deleted packages

* Remove debug output from Linux CI

* Update Geodiff to 2.2.0

* Fix nuget for Linux CI again

* Reintroduce Geodiff warning flag

* Update runner versions and cmake minor version

* Update xCode version to 26.4.1

* Remove deployment target for apple builds

* Fix dep install on Linux CI

* Update or remove manual versions of Qt in CI

* Remove unused env var in Gallery CI

* Fix missing mono package on newer Ubuntu

* Return xvfb package on Linux CI

* Wrap geodiff compilation flag to apple only

* Add package for libxcrypt

* Update signing certs for iOS

* Another try to fix iOS certs

* Fix iOS signing cert

* Format geodiff port

* Update QtDeclarative to 6.10.3

* Remove QtKeychain overlay port

* Update cmake info in INSTALL.md

* Remove QtMultimedia overlay port, use VCPKG default

* Update QtPositioning to 6.10.3

* Remove GStreamer overlay port and use VCPKG default

* Remove libb2 overlay port, vcpkg bug should be fixed now

* Update libiconv overlay port to match VCPKG port

* Add LibSpatialIndex port info to README

* Remove unused qca patches, update README

* Remove libspatialindex overlay port & pin version in vcpkg.json

* Remove qtbase overlay port in place of VCPKG default port

* Add wayland support for linux build

* Update xcode in Android CI

* Update cmake version in CI to match used by VCPKG

* Add wayland packages for linux build

* Add pcre2 port to fix android linker error

* Update android CI

* Update Android setup based on Qt 6.10

* Fix Android build issues

* Format cmake

* Fix Android ARMv7 build

* WIP fixed safe area rendering on iOS and cmake configuration for android (#4472)

* Add libpq port for iOS

* Fix another libpq issue on iOS

* Fix iOS build arg for make in VCPKG

* Remove libiconv port

* Fix qtpositioning patches for windows

* Fix qgis patches for Windows

* Add fix for windows build failing on lazperf

* Amend last windows fix to target only windows

* Fix local ios VCPKG build failing on race condition

* Fix qtmultimedia build on iOS

* Fix windows QGIS again

* Fix windows packager

* Fix ios Spatialite build

* Fix missing symbols for ios

* Format cmake

* Upload AABs to Google play

* Fix failing maptools tests

QGIS 3.44 started enforcing constness, where we relied on semi-constness

* Fix lcov

* Polish linux CI file

* Mitigate coveralls breaking CI

* Fix Linux install

* Fixed the top and bottom overpadding for feature list page drawer (#4510)

* Update Linux cleanup action

* Fix windows gallery CI

* Fix missing highlight for Qt 6.10 (#4511)

* Fix linux build

* Explore Linux CI mirror list

* Explore Linux CI debug info

* Remove broken enzu mirror

* Remove unnecessary step

* Fix permission problem

---------

Co-authored-by: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Co-authored-by: Gabriel Bolbotina <80618569+gabriel-bolbotina@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants