Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move projVersionMajor to cpp #42158

Merged
merged 1 commit into from Mar 10, 2021
Merged

Conversation

vcloarec
Copy link
Member

@vcloarec vcloarec commented Mar 10, 2021

To allow calling to method of this class through the qgis core lib from third stand alone application.

Not sure because maybe there are some reasons to have the definition in the header...

backport to 3.18 ? (could be appreciate)

@vcloarec
Copy link
Member Author

@nyalldawson , are you ok for a backport to 3.18 ?

@nyalldawson
Copy link
Collaborator

@vcloarec sure

@nyalldawson nyalldawson merged commit e0489b3 into qgis:master Mar 10, 2021
@github-actions
Copy link

The backport to release-3_18 failed:

The process '/usr/bin/git' failed with exit code 1

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-3_18 release-3_18
# Navigate to the new working tree
cd .worktrees/backport-release-3_18
# Create a new branch
git switch --create backport-42158-to-release-3_18
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 e0489b3113774b6bb66426b9bf05e6d023c8d7b9
# Push it to GitHub
git push --set-upstream origin backport-42158-to-release-3_18
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_18

Then, create a pull request where the base branch is release-3_18 and the compare/head branch is backport-42158-to-release-3_18.

vcloarec added a commit to vcloarec/QGIS that referenced this pull request Mar 10, 2021
@vcloarec vcloarec deleted the proj_version_cpp branch March 11, 2021 12:32
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.

None yet

2 participants