AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Do not set release flag for signed package

Browse Source 
Before this change, signing package by androiddeployqt automatically
implied the --release option.
It is possible to create both debug and release packages when signing on
Android, so we shouldn't be enforcing this restriction on Qt app builds.

Commit removes setting releasePackage option, when processing the --sign
argument in androiddeployqt.

Task-number: QTBUG-103281
Change-Id: Id40a41255e51d6820b44f078667dc8318a90bbc5
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Bartlomiej Moskal 2022-05-19 08:11:08 +02:00
parent 7466422e9c
commit 9efaf8bae9
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/androiddeployqt/main.cpp
View File

@ -429,12 +429,10 @@ Options parseOptions()
fprintf(stdout, fprintf(stdout,
"Using package signing path and alias values found from the " "Using package signing path and alias values found from the "
"environment variables.\n"); "environment variables.\n");
options.releasePackage = true;
options.keyStore = keyStore; options.keyStore = keyStore;
options.keyStoreAlias = storeAlias; options.keyStoreAlias = storeAlias;
} }
} else { } else {
options.releasePackage = true;
options.keyStore = arguments.at(++i); options.keyStore = arguments.at(++i);
options.keyStoreAlias = arguments.at(++i); options.keyStoreAlias = arguments.at(++i);
} }
@ -573,8 +571,7 @@ void printHelp()
" package will be signed with a debug key.\n" " package will be signed with a debug key.\n"
"\n" "\n"
" --sign <url/to/keystore> <alias>: Signs the package with the\n" " --sign <url/to/keystore> <alias>: Signs the package with the\n"
" specified keystore, alias and store password. Also implies the\n" " specified keystore, alias and store password.\n"
" --release option.\n"
" Optional arguments for use with signing:\n" " Optional arguments for use with signing:\n"
" --storepass <password>: Keystore password.\n" " --storepass <password>: Keystore password.\n"
" --storetype <type>: Keystore type.\n" " --storetype <type>: Keystore type.\n"