Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into qt-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits)
  Check if the timeout expired during the time update in qt_safe_select
  Fix crashes when deleting QWidgets and QGraphicsItems in touch event handlers.
  Fix tst_QTouchEvent::touchUpdateAndEndNeverPropagate()
  Document QTextEncoder::fromUnicode as QT3 support member
  Install private headers when configuring Qt with -developer-build.
  Ensure that QProcessEnvironment::operator== doesn't crash
  Fixes a qfileinfo autotest.
  Fix compilation if QT_NO_DATESTRING is defined.
  Fix compilation: private headers must be #included with ""
  Use realpath() only on systems we know it works on.
  Mixed up top/bottom
  QGtkStyle: support for the inner-border property in GtkButtons
  Fixed uninitialized background artifacts in QWidget::render.
  Compile with -no-exceptions on Mac.
  Fixed searching and copy/paste from PDF documents.
  Autotest: ensure that QSharedPointer does proper autocasting through
  Compile on Windows CE.
  Add copyright header so the autotest will pass.
  Add support for the Selected QIcon::Mode when rendering the systray icon (Mac)
  Added a manual test for testing a z-order of overlapping widgets.
  ...

1 files changed, 6 insertions, 0 deletions

diff --git a/bin/syncqt b/bin/syncqt
index a14a82d..629e124 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -666,6 +666,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/;
@@ -834,6 +835,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);
                 }
@@ -878,6 +883,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";