Merged
Conversation
Pull Request Test Coverage Report for Build 16661476917Details
💛 - Coveralls |
Collaborator
|
I guess we will merge this together with #3811 as it would require building mobile-sdk with the new NDK, right @Withalion @PeterPetrik ? |
Contributor
Author
|
Yes, somehow on mac VCPKG build passes with old android sdk, but on Linux it requires new |
Withalion
force-pushed
the
target-android-15
branch
2 times, most recently
from
2539f01 to
6a26a29
Compare
Withalion
force-pushed
the
target-android-15
branch
4 times, most recently
from
36fd6d7 to
7a954a8
Compare
Contributor
|
I would just close this PR and add the changes to the vcpkg build (?) |
Contributor
Author
|
Merging this to master first and then rebasing VCPKG sounds better to me. There are still some things left which I need to solve here. |
Withalion
force-pushed
the
target-android-15
branch
from
7a954a8 to
713d9e1
Compare
Contributor
Author
|
The android package size is again normal. So this is ready for merge |
Withalion
force-pushed
the
dev/2025.7.0
branch
from
d4e68ff to
69b96a0
Compare
Withalion
force-pushed
the
target-android-15
branch
from
713d9e1 to
d3457c9
Compare
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>
gabriel-bolbotina
pushed a commit
that referenced
this pull request
Nov 25, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes #3889
fixes #3888
increase android target to Android 15 and update some more dependencies
This change requires newer android SDK!