Merge branch '4.6'

Conflicts:
	doc/src/qt4-intro.qdoc

4 files changed, 12 insertions, 6 deletions

diff --git a/bin/createpackage.bat b/bin/createpackage.bat
index 7381888..7381888 100644..100755
--- a/bin/createpackage.bat
+++ b/bin/createpackage.bat
diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 4597b04..7e87758 100644..100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -146,9 +146,9 @@ my $signed_sis_name = $pkgoutputbasename.".sis";
 my $scriptpath = dirname(__FILE__);
 my $certtext = $certificate;
 my $certpath = $scriptpath;
-$certpath =~ s-^(.*[^\\])$-$1\\-o;      # ensure path ends with a backslash
-$certpath = $certpath."../";            # certificates are one step up in hierarcy
-$certpath =~ s-/-\\-go;	                # for those working with UNIX shells
+$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
 
 # Check some pre-conditions and print error messages if needed
 unless (length($templatepkg) && length($platform) && length($target)) {
diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
index bfd34f0..bfd34f0 100644..100755
--- a/bin/patch_capabilities.pl
+++ b/bin/patch_capabilities.pl
diff --git a/bin/syncqt b/bin/syncqt
index b83ab55..8737c47 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -528,7 +528,7 @@ sub findFiles {
         } else {
             ($dir =~ /\/$/) || ($dir .= "/");
         }
-        foreach $file ( readdir(D) ) {
+        foreach $file ( sort readdir(D) ) {
             next if ( $file  =~ /^\.\.?$/ );
             $p = $file;
             ($file =~ /$match/) && (push @files, $p);
@@ -842,9 +842,15 @@ foreach (@modules_to_sync) {
     $master_contents .= "#endif\n";
 
     unless($showonly) {
-        unless ($lib eq "phonon") {
+        my @master_includes;
+        if ($lib eq "phonon") {
+            push @master_includes, "$out_basedir/include/phonon_compat/phonon/phonon";
+            push @master_includes, "$out_basedir/include/phonon/Phonon/Phonon";
+        } else {
+            push @master_includes, "$out_basedir/include/$lib/$lib";
+        }
+        foreach my $master_include (@master_includes) {
             #generate the "master" include file
-            my $master_include = "$out_basedir/include/$lib/$lib";
             $pri_install_files .= fixPaths($master_include, "$modules{$lib}") . " "; #get the master file installed too
             if($master_include && -e "$master_include") {
                 open MASTERINCLUDE, "<$master_include";