Merge remote-tracking branch 'origin/5.6.0' into 5.7

Change-Id: Idcda6d52266f557ce4a819b6669f6797473a48a2
RDevCore · Mar 7, 2016 · f930328 · f930328
2 parents bcd88d8 + d0cdc7a
commit f930328
Show file tree

Hide file tree

Showing 14 changed files with 631 additions and 29 deletions.
diff --git a/bin/syncqt.pl b/bin/syncqt.pl
@@ -189,6 +189,7 @@ sub shouldMasterInclude {
     if (open(F, "<$iheader")) {
         while (<F>) {
             chomp;
+            chop if /\r$/;
             return 0 if (/^\#pragma qt_no_master_include$/);
         }
         close(F);