Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
	src/plugins/qmltooling/qmldbg_ost/qostdevice.h

1 files changed, 3 insertions, 1 deletions

diff --git a/bin/syncqt b/bin/syncqt
index 32b5384..b25a432 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -335,7 +335,9 @@ sub syncHeader {
         open HEADER, ">$header" || die "Could not open $header for writing!\n";
         print HEADER "#include \"$iheader_out\"\n";
         close HEADER;
-        utime(time, $ts, $header) or die "$iheader, $header";
+        if(defined($ts)) {
+            utime(time, $ts, $header) or die "$iheader, $header";
+        }
         return 1;
     }
     return 0;