summaryrefslogtreecommitdiffstats
path: root/bin/syncqt
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-09-29 04:09:01 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-09-29 04:09:01 (GMT)
commit575ad2c60482b279f828cfa87186b5fbb10f76c6 (patch)
tree101df52cd4b769dc8d10ef60714f25d819636e70 /bin/syncqt
parenta913e326409062bbc1cad4d5898181c7b81cba23 (diff)
parent638f46a96b68d21137c4903c68015752ebdf58dc (diff)
downloadQt-575ad2c60482b279f828cfa87186b5fbb10f76c6.zip
Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.tar.gz
Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts: configure.exe mkspecs/features/qt.prf
Diffstat (limited to 'bin/syncqt')
-rwxr-xr-xbin/syncqt12
1 files changed, 9 insertions, 3 deletions
diff --git a/bin/syncqt b/bin/syncqt
index 2e2d6f8..a14a82d 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -530,7 +530,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);
@@ -845,9 +845,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";