Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	.gitignore
	tests/benchmarks/benchmarks.pro

1 files changed, 6 insertions, 0 deletions

diff --git a/bin/syncqt b/bin/syncqt
index 432e452..307b157 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -677,6 +677,7 @@ foreach (@modules_to_sync) {
     #information used after the syncing
     my $pri_install_classes = "";
     my $pri_install_files = "";
+    my $pri_install_pfiles = "";
 
     my $libcapitals = $lib;
     $libcapitals =~ y/a-z/A-Z/;
@@ -845,6 +846,10 @@ foreach (@modules_to_sync) {
 				$pri_install_files.= "$pri_install_iheader ";;
 			    }
 			}
+			else {
+			    my $pri_install_iheader = fixPaths($iheader, $current_dir);
+			    $pri_install_pfiles.= "$pri_install_iheader ";;
+			}
                     }
 		    print "header created for $iheader ($header_copies)\n" if($header_copies > 0 && !$quiet);
                 }
@@ -889,6 +894,7 @@ foreach (@modules_to_sync) {
 	my $headers_pri_contents = "";
 	$headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n";
 	$headers_pri_contents .= "SYNCQT.HEADER_CLASSES = $pri_install_classes\n";
+	$headers_pri_contents .= "SYNCQT.PRIVATE_HEADER_FILES = $pri_install_pfiles\n";
         my $headers_pri_file = "$out_basedir/include/$lib/headers.pri";
         if(-e "$headers_pri_file") {
             open HEADERS_PRI_FILE, "<$headers_pri_file";