Merge branch '4.6'

Conflicts:
	doc/src/qt4-intro.qdoc

1 files changed, 9 insertions, 3 deletions

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";