Merge remote-tracking branch 'origin/5.6.0' into 5.7v5.7.0-alpha1

Change-Id: Idcda6d52266f557ce4a819b6669f6797473a48a2

1 files changed, 1 insertions, 0 deletions

diff --git a/bin/syncqt.pl b/bin/syncqt.pl
index ac8aa1a0f7..0c10ccbe14 100755
--- 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);