Skip to content

Fix android missing proj & qgis resources on android#4155

Merged
tomasMizera merged 6 commits intodev/2025.7.0from
fix/android-proj
Oct 21, 2025
Merged

Fix android missing proj & qgis resources on android#4155
tomasMizera merged 6 commits intodev/2025.7.0from
fix/android-proj

Conversation

@Withalion
Copy link
Contributor

fixes #4152

Let's hope we can go collecting in the field tomorrow.

@Withalion Withalion requested a review from tomasMizera October 14, 2025 22:21
@github-actions
Copy link

github-actions bot commented Oct 15, 2025

Pull Request Test Coverage Report for Build 18521776844

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 3 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.003%) to 19.465%

Files with Coverage Reduction New Missed Lines %
build-mm-db/vcpkg_installed/x64-linux/include/Qt6/QtCore/qhash.h 1 81.05%
mm/app/layerfeaturesmodel.cpp 2 78.88%
Totals Coverage Status
Change from base Build 18496970949: -0.003%
Covered Lines: 13813
Relevant Lines: 70962

💛 - Coveralls

@Withalion Withalion linked an issue Oct 15, 2025 that may be closed by this pull request
@tomasMizera tomasMizera linked an issue Oct 20, 2025 that may be closed by this pull request
Copy link
Collaborator

@tomasMizera tomasMizera left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's tackle the app/android/assets paths to be platform-specific in the upcoming work

@tomasMizera tomasMizera merged commit 76b65ba into dev/2025.7.0 Oct 21, 2025
8 of 9 checks passed
@tomasMizera tomasMizera deleted the fix/android-proj branch October 21, 2025 08:58
wonder-sk pushed a commit that referenced this pull request Oct 22, 2025
tomasMizera added a commit that referenced this pull request Oct 31, 2025
* Target android 15 (#4010)

* Remove dep on mobile-sdk (Hello vcpkg) (#3811)

Remove dependency on mobile-sdk and system Qt via building of all Mergin Maps deps libraries (QGIS, GDAL, Proj, Qt, and others) by vcpkg system. Changes to CI GitHub workflows, asset management and shared files for platforms. Fixed windows and linux builds.

* Fix error dump on quit from QML components (#4104)

* Fix/diagnostic log copy able (#4120)

* Fix windows EOF breaking preview

* Refactor AttributePreviewController

* Add new formats for Exiv2 library (#4125)

* Merge pull request #4129 from MerginMaps/fix/haptic-vibration

Fix haptic vibration

* Fix android CI (#4122)

* Fix android CI

* Update version to 2025.7.0

* Fix apk size

* Death to input (#4103)

* Fix ios crash not crash (#4131)

* Fix the double deletion of Qml Engine

* Fix formatting & Clazy warning

* Fix forgotten ndk path variable (#4150)

* Fix android missing proj & qgis resources on android (#4155)

* Sign AABs too

---------

Co-authored-by: Peter Petrik <zilolv@gmail.com>
Co-authored-by: Kaustuv Pokharel <85729205+kaustuvpokharel@users.noreply.github.com>
Co-authored-by: Tomas Mizera <tomas.mizera@lutraconsulting.co.uk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Background layer doesn't display Misplaced current position

2 participants