Merged
Conversation
Withalion
force-pushed
the
death-to-input
branch
from
821733f to
ce3b7b3
Compare
tomasMizera
reviewed
Sep 12, 2025
Contributor
|
fixes #4118 |
Withalion
force-pushed
the
death-to-input
branch
from
446c054 to
d35ca91
Compare
Withalion
force-pushed
the
death-to-input
branch
from
d35ca91 to
5a22361
Compare
Contributor
Author
|
Should be ready for review now. Maybe I forgot to change something, but I don't know. |
Pull Request Test Coverage Report for Build 18345087329Details
💛 - Coveralls |
PeterPetrik
reviewed
Oct 9, 2025
Comment on lines
-382
to
-403
| if (ANDROID) | ||
| if (VCPKG_TARGET_TRIPLET STREQUAL "arm-android") | ||
| set(CMAKE_C_FLAGS | ||
| "${CMAKE_C_FLAGS} -fPIC -fstack-protector-strong -lunwind -Wl,--exclude-libs=libunwind.a" | ||
| ) | ||
| set(CMAKE_CXX_FLAGS | ||
| "${CMAKE_CXX_FLAGS} -fPIC -fstack-protector-strong -lunwind -Wl,--exclude-libs=libunwind.a" | ||
| ) | ||
| else () | ||
| set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -fstack-protector-strong") | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fstack-protector-strong") | ||
| endif () | ||
|
|
||
| link_libraries("-ljnigraphics") | ||
|
|
||
| # Make sure the generator for android_deployment_settings.json can figure out the | ||
| # architecture | ||
| list(APPEND CMAKE_FIND_ROOT_PATH /) | ||
|
|
||
| # set(ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_BINARY_DIR}/android-template) | ||
| endif () | ||
|
|
Contributor
There was a problem hiding this comment.
why this is removed and what does it have with renaming of input -> mm?
Comment on lines
-421
to
-439
|
|
||
| # ######################################################################################## | ||
| # RESOURCES | ||
| # ######################################################################################## | ||
| message(STATUS "Copying proj and qgis resources to android/assets/qgis-data") | ||
| file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/app/android/assets/qgis-data/resources) | ||
| file(COPY ${QGIS_RESOURCE_DIR}/qgis.db | ||
| DESTINATION ${CMAKE_BINARY_DIR}/app/android/assets/qgis-data/resources/ | ||
| ) | ||
| file(COPY ${QGIS_RESOURCE_DIR}/srs.db | ||
| DESTINATION ${CMAKE_BINARY_DIR}/app/android/assets/qgis-data/resources/ | ||
| ) | ||
| file( | ||
| COPY ${PROJ_DIR} | ||
| DESTINATION ${CMAKE_BINARY_DIR}/app/android/assets/qgis-data/ | ||
| PATTERN "*.cmake" EXCLUDE | ||
| PATTERN "vcpkg*" EXCLUDE | ||
| ) | ||
|
|
Contributor
There was a problem hiding this comment.
why this is removed and what does it have with renaming of input -> mm?
Contributor
Author
|
@PeterPetrik the mentioned code deletion has actually nothing to do with renaming Mergin Maps. It's part of this commit where I was removing duplicate code after I probably screwed up rebasing |
tomasMizera
approved these changes
Oct 9, 2025
Collaborator
tomasMizera
left a comment
tomasMizera
left a comment
There was a problem hiding this comment.
Let's merge and see 
Contributor
that if Friday attitude ! |
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 19, 2025
gabriel-bolbotina
pushed a commit
that referenced
this pull request
Nov 25, 2025
gabriel-bolbotina
pushed a commit
that referenced
this pull request
Dec 18, 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.
Some more work to switch from Input to Mergin Maps in code