diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-10-26 10:50:28 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-10-27 01:08:57 (GMT) |
| commit | e8123e3392ecc36177d9a8537c2dd32a258ab3cb (patch) | |
| tree | 9d9dd221ed24907fb9adfb90550abc1815a811d5 | |
| parent | d093af32cd780a13a3e43e9c292c53ce9160151e (diff) | |
| download | Qt-e8123e3392ecc36177d9a8537c2dd32a258ab3cb.zip Qt-e8123e3392ecc36177d9a8537c2dd32a258ab3cb.tar.gz Qt-e8123e3392ecc36177d9a8537c2dd32a258ab3cb.tar.bz2 | |
Fix patch_capabilities.pl script for explicit set of capabilities
Elftran command never got executed when explicit set of capabilities
was defined. No warning or error was printed either, making it rather
confusing for user.
Task-number: QTBUG-14730
Reviewed-by: Janne Koskinen
(cherry picked from commit f603ce9a960ee387ab10be1916da8ffd09305045)
| -rwxr-xr-x | bin/patch_capabilities.pl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl index 76ba24b..430cbcb 100755 --- a/bin/patch_capabilities.pl +++ b/bin/patch_capabilities.pl @@ -269,6 +269,9 @@ if (@ARGV) if (@capabilitiesSpecified) { $commandToExecute = sprintf($baseCommandToExecute, join(" ", @capabilitiesSpecified)); + $executeNeeded = 1; + my $capString = join(" ", @capabilitiesSpecified); + print ("Patching: Patching the the Vendor ID to 0 and the capabilities used to: \"$capString\" in \"$binaryBaseName\".\n"); } else { # Test which capabilities are present and then restrict them to the allowed set. # This avoid raising the capabilities of apps that already have none. |