don't overwrite AndroidManifest.xml and configAndroid.json#1
Open
aconchillo wants to merge 1 commit intocalincru:masterfrom
Open
don't overwrite AndroidManifest.xml and configAndroid.json#1aconchillo wants to merge 1 commit intocalincru:masterfrom
aconchillo wants to merge 1 commit intocalincru:masterfrom
Conversation
Don't create the generated configured files (AndroidManifest.xml and configAndroid.json) in the binary directory because androiddeployqt will overwrite them with the default ones. We now generate AndroidManifest.xml and configAndroid.json in the source directory and make "android-package-source-directory" point to "@CMAKE_CURRENT_SOURCE_DIR@", this will avoid copying a bunch of files as well.
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
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.
Don't create the generated configured files (AndroidManifest.xml and
configAndroid.json) in the binary directory because androiddeployqt will
overwrite them with the default ones.
We now generate AndroidManifest.xml and configAndroid.json in the source
directory and make "android-package-source-directory" point to
"@CMAKE_CURRENT_SOURCE_DIR@", this will avoid copying a bunch of files
as well.