Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	src/gui/graphicsview/qgraphicsitem_p.h
	src/gui/graphicsview/qgraphicsscene.cpp

2 files changed, 26 insertions, 7 deletions

diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index af46e04..a180864 100644
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -52,7 +52,7 @@ unless (GetOptions('i|install' => \$install, 'p|preprocess' => \$preprocessonly)
 
 # Read params to variables
 my $templatepkg = $ARGV[0];
-my $targetplatform = uc $ARGV[1];
+my $targetplatform = lc $ARGV[1];
 
 my @tmpvalues = split('-', $targetplatform);
 my $target = $tmpvalues[0];
diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
index f1d94e0..005d587 100644
--- a/bin/patch_capabilities.pl
+++ b/bin/patch_capabilities.pl
@@ -7,6 +7,17 @@
 #
 #######################################################################
 
+sub Usage() {
+    print("This script can be used to set capabilities of all binaries\n");
+    print("specified for deployment in a .pkg file.\n");
+    print("If no capabilities are given, the binaries will be given the\n");
+    print("capabilities supported by self-signed certificates.\n");
+    print("\nUsage: patch_capabilities.pl pkg_filename [target-platform] [capability list]\n");
+    print("    If template .pkg file is given, next agrument must be 'target-platform'.\n");    
+    print("\nE.g. patch_capabilities.pl myapp_template.pkg release-armv5 \"All -TCB\"\n");
+    exit();
+}
+
 my @capabilitiesToSet = ("LocalServices", "NetworkServices", "ReadUserData", "UserEnvironment", "WriteUserData");
 
 # If arguments were given to the script,
@@ -15,6 +26,19 @@ if (@ARGV)
     # Parse the first given script argument as a ".pkg" file name.
     my $pkgFileName = shift(@ARGV);
 
+    # Check if using template .pkg and do preprocessing if needed
+    if (($pkgFileName =~ m|_template\.pkg$|i) && -r($pkgFileName)) 
+    {
+        my $target;
+        unless ($target = shift(@ARGV)) 
+        {
+            Usage();
+        }
+        
+        system ("createpackage.bat -p ".$pkgFileName." ".$target);   
+        $pkgFileName =~ s/_template\.pkg/_${target}\.pkg/;
+    }
+
     # If the specified ".pkg" file exists (and can be read),
     if (($pkgFileName =~ m|\.pkg$|i) && -r($pkgFileName))
     {
@@ -98,10 +122,5 @@ if (@ARGV)
 }
 else
 {
-    print("This script can be used to set capabilities of all binaries\n");
-    print("specified for deployment in a .pkg file.\n");
-    print("If no capabilities are given, the binaries will be given the\n");
-    print("capabilities supported by self-signed certificates.\n");
-    print("\nUsage: patch_capabilities.pl pkg_filename [capability list]\n");
-    print("\nE.g. patch_capabilities.pl myapp_armv5_urel.pkg \"All -TCB\"\n");
+    Usage();
 }