diff options
author | axis <qt-info@nokia.com> | 2010-03-16 14:12:29 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2010-03-16 14:12:29 (GMT) |
commit | 0fc2735a80300139510933e2b8856f6c7fbc9a2b (patch) | |
tree | dc51a7ba9f0733162391482a1e2c03e84963c559 | |
parent | 27f6a2b79c5ded8ce54c8a3ab068f3e42804c94c (diff) | |
download | Qt-0fc2735a80300139510933e2b8856f6c7fbc9a2b.zip Qt-0fc2735a80300139510933e2b8856f6c7fbc9a2b.tar.gz Qt-0fc2735a80300139510933e2b8856f6c7fbc9a2b.tar.bz2 |
Fixed "Cannot install protected application" message on Symbian.
This was due the patch_capabilities step running too late in the sis
creation process. This led to the package ID being wrong the first
time "make sis" was run, but correct on subsequent runs.
RevBy: Trust me
Task: QTBUG-8770
-rwxr-xr-x | bin/createpackage.pl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bin/createpackage.pl b/bin/createpackage.pl index c16c692..554d619 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -237,6 +237,11 @@ if (!$preservePkgOutput) { } # Preprocess PKG +if ($certtext eq "Self Signed" && !@certificates) { + print("Patching capabilities for self signed package $certificate\n"); + system ("patch_capabilities $templatepkg $targetplatform"); +} + local $/; # read template file open( TEMPLATE, $templatepkg) or die "Error '$templatepkg': $!\n"; @@ -272,10 +277,6 @@ if($stub) { # Create stub SIS. system ("makesis -s $pkgoutput $stub_sis_name"); } else { - if ($certtext eq "Self Signed" && !@certificates) { - print("Patching capabilities for self signed package $certificate\n"); - system ("patch_capabilities $templatepkg $targetplatform"); - } # Create SIS. # The 'and' is because system uses 0 to indicate success. system ("makesis $pkgoutput $unsigned_sis_name") and die ("makesis failed"); |