Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed the host detection in qmake profiles.
  Improving parts of commit 2d8d855d.
  qmake: add Linux host support to Symbian generator
  Fixed indentation.
  Add Linux host support to Symbian mkspecs.
  Linux support for platform specific commands in .pro files.
  Add createpackage.bat equivalent for Unix systems.
  Make all Symbian #includes lower case.
  mkspecs: fix warning when calling qmake
  Fix portability problems in bin/createpackage.pl.

1 files changed, 6 insertions, 8 deletions

diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 197dffe..ff89b64 100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -145,10 +145,8 @@ my $signed_sis_name = $pkgoutputbasename.".sis";
 # Store some utility variables
 my $scriptpath = dirname(__FILE__);
 my $certtext = $certificate;
-my $certpath = $scriptpath;
-$certpath =~ s-^(.*[^\\])$-$1\\-o;          # ensure path ends with a backslash
-$certpath =~ s-/-\\-go;                     # for those working with UNIX shells
-$certpath =~ s-bin\\$-src\\s60installs\\-;  # certificates are one step up in hierarcy
+# certificates are one step up in hierarchy
+my $certpath = File::Spec->catdir($scriptpath, File::Spec->updir(), "src/s60installs/");
 
 # Check some pre-conditions and print error messages if needed
 unless (length($templatepkg) && length($platform) && length($target)) {
@@ -172,14 +170,14 @@ if (length($certificate)) {
 } else {
     #If no certificate is given, check default options
     $certtext = "RnD";
-    $certificate = $certpath."rd.cer";
-    $key = $certpath."rd-key.pem";
+    $certificate = File::Spec->catfile($certpath, "rd.cer");
+    $key = File::Spec->catfile($certpath, "rd-key.pem");
 
     stat($certificate);
     unless( -e _ ) {
         $certtext = "Self Signed";
-        $certificate = $certpath."selfsigned.cer";
-        $key = $certpath."selfsigned.key";
+        $certificate = File::Spec->catfile($certpath, "selfsigned.cer");
+        $key = File::Spec->catfile($certpath, "selfsigned.key");
     }
 }