Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (142 commits)
  ifdef out mac/no_coreservices path more cleanly
  fix build on symbian
  Allow different text for undo actions and items in QUndoView
  Allow using not only prefixes for undo command text
  QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case
  Massively update the hurd-g++ mkspec.
  Do not allow multiple threads to acquire a QMutex
  Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.
  don't crash in QProcessEnvironment::systemEnvironment()
  HTTP backend: do not load resources from cache that must be revalidated
  Compile fix for QLocale on Symbian.
  Added Kazakh language to the QLocale mapping table on Symbian.
  Added support for QLocale::uiLanguages on Symbian.
  Fix drawing text in item view:
  Add enablers for Symbian App Booster
  Don't rely on uninitialized data
  Don't realloc user-provided buffer
  qmake: Introduce new template type
  Make autotest more resilient against network timeout (cherry picked from commit 50be38737507f5c23b4d050e635a200024164a13)
  Do not filter adhoc clients (cherry picked from commit 4fe5307af44a76b99cc8c70aa330180c1985eabc)
  ...

1 files changed, 10 insertions, 4 deletions

diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index b7457e1c0b..aae20ae929 100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -238,11 +238,7 @@ if ($templatepkg =~ m/_installer\.pkg$/i && $onlyUnsigned) {
 my $unsigned_sis_name = $sisoutputbasename."_unsigned.sis";
 my $stub_sis_name = $sisoutputbasename.".sis";
 
-# Store some utility variables
-my $scriptpath = dirname(__FILE__);
 my $certtext = $certificate;
-# 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)) {
@@ -265,6 +261,16 @@ if (length($certificate)) {
     }
 } else {
     #If no certificate is given, check default options
+    my $scriptpath = dirname(__FILE__);
+    my $certpath = File::Spec->catdir($scriptpath, File::Spec->updir(), "src/s60installs");
+
+    unless (-e $certpath) {
+        my $qmakeCmd = File::Spec->catfile($scriptpath, "qmake");
+        $certpath = `$qmakeCmd -query QT_INSTALL_PREFIX`;
+        $certpath =~ s/\s+$//;
+        $certpath = File::Spec->catdir($certpath, "src/s60installs");
+    }
+
     $certtext = "RnD";
     $certificate = File::Spec->catfile($certpath, "rd.cer");
     $key = File::Spec->catfile($certpath, "rd-key.pem");