Skip to content

QFieldCloud filename compatibility fixes - #8119

Merged
nirvn merged 3 commits into
masterfrom
cloud_filename_compatibility_fix
Oct 16, 2026
Merged

nirvn merged 3 commits into
masterfrom
cloud_filename_compatibility_fix

Conversation

@nirvn

@nirvn nirvn commented Oct 15, 2026

Copy link
Copy Markdown
Member

This PR improves handling of project and PDF layout filename generated by QField within the context of cloud projects to insure we match the restrained supported set of characters. This will reduce the instances of people trying (and failing) to manually push their layout PDFs to the cloud.

@qfield-fairy

qfield-fairy commented Oct 15, 2026 •

Copy link
Copy Markdown
Collaborator

🍎 MacOS DMG universal builds

Download a MacOS DMG universal build of this PR for testing.
(Built from commit 1b00417)

📱 Android builds

Download an Android arm64 build of this PR for testing.
(Built from commit 1b00417)

Other Android architectures

🪟 Windows builds

Download a Windows build of this PR for testing and for arm64.

(Built from commit 1b00417)

🐧 Linux AppImage builds

Download a Linux AppImage build of this PR for testing.
(Built from commit 1b00417)

@nirvn
nirvn force-pushed the cloud_filename_compatibility_fix branch from 505e288 to 1b00417 Compare October 15, 2026 10:06
@nirvn
nirvn merged commit 61ffd50 into master Oct 16, 2026
30 checks passed
@nirvn
nirvn deleted the cloud_filename_compatibility_fix branch October 16, 2026 01:53
@qfield-fairy

Copy link
Copy Markdown
Collaborator

The backport to release-4_3 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0481b6e17... Come up with better cloud project file names when created within QField
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging src/app/qgismobileapp.cpp
[backport-8119-to-release-4_3 1cf37c49a] Insure that generated layout PDF file names within cloud projects match restricted character set supported by QFieldCloud
 Author: Mathieu Pellerin <nirvn.asia@gmail.com>
 Date: Thu Oct 15 16:13:10 2026 +0700
 1 file changed, 12 insertions(+), 2 deletions(-)
Auto-merging src/core/qfieldcloud/qfcloudprojectsmodel.cpp
CONFLICT (modify/delete): src/core/qfmarkupmanager.cpp deleted in HEAD and modified in 0481b6e17 (Come up with better cloud project file names when created within QField).  Version 0481b6e17 (Come up with better cloud project file names when created within QField) of src/core/qfmarkupmanager.cpp left in tree.
Auto-merging src/core/utils/qfprojectutils.cpp

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-4_3 release-4_3
# Navigate to the new working tree
cd .worktrees/backport-release-4_3
# Create a new branch
git switch --create backport-8119-to-release-4_3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 9b68aaf698305c6834ffb308a890033e535b2bf3 0481b6e17b13910cbbb469046f1dd5937e554354 1b00417be1cc4ff58b63105dd931438f93b45c6e
# Push it to GitHub
git push --set-upstream origin backport-8119-to-release-4_3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-4_3

Then, create a pull request where the base branch is release-4_3 and the compare/head branch is backport-8119-to-release-4_3.

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.

3 participants