summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-10-19 14:51:33 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-10-21 08:23:11 (GMT)
commita6af1538ea53408399fb29870a4ef16a92c7893a (patch)
tree650647006e6f13dfdde00fa78421c966360a6f54 /bin
parentefd2bbd159bb4810ed828c842f459e6fcb8eb783 (diff)
downloadQt-a6af1538ea53408399fb29870a4ef16a92c7893a.zip
Qt-a6af1538ea53408399fb29870a4ef16a92c7893a.tar.gz
Qt-a6af1538ea53408399fb29870a4ef16a92c7893a.tar.bz2
Switch from *-armv5 to *-armv6.
Change from armv5 to armv6 by default. This updates documentation, the convenience scripts, and the Raptor/abld qmake generator to use armv6 instead. Task-number: QTBUG-4891 Reviewed-by: Jason Barron
Diffstat (limited to 'bin')
-rwxr-xr-xbin/createpackage.pl4
-rwxr-xr-xbin/patch_capabilities.pl2
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 7e87758..fe141d7 100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -85,10 +85,10 @@ Where parameters are as follows:
passphrase = The certificate's private key file's passphrase
Example:
- createpackage.pl fluidlauncher_template.pkg release-armv5
+ createpackage.pl fluidlauncher_template.pkg release-armv6
Example with certfile:
- createpackage.pl -c=mycerts.txt fluidlauncher_template.pkg release-armv5
+ createpackage.pl -c=mycerts.txt fluidlauncher_template.pkg release-armv6
Content of 'mycerts.txt' must be something like this:
# This is comment line, also the empty lines are ignored
diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
index bfd34f0..e570632 100755
--- a/bin/patch_capabilities.pl
+++ b/bin/patch_capabilities.pl
@@ -53,7 +53,7 @@ sub Usage() {
print("capabilities supported by self-signed certificates.\n");
print("\n *** NOTE: If *_template.pkg file is given, 'target-platform' is REQUIRED. ***\n");
print("\nUsage: patch_capabilities.pl pkg_filename <target-platform> [capability list]\n");
- print("\nE.g. patch_capabilities.pl myapp_template.pkg release-armv5 \"All -TCB\"\n");
+ print("\nE.g. patch_capabilities.pl myapp_template.pkg release-armv6 \"All -TCB\"\n");
exit();
}