From 38944d662eda76ecc57cb1fd61da42775fa52f6f Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@theqtcompany.com>
Date: Wed, 24 Feb 2016 12:57:18 +0100
Subject: [PATCH] Fix syncqt.pl not respecting #pragma qt_no_master_include in
files with Windows line endings
We need to do the same chop trick that we do further down the file.
Change-Id: If4f832f375a11473e66adfcfa76a3b4504b3d406
Task-number: QTBUG-51324
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
bin/syncqt.pl | 1 +
1 file changed, 1 insertion(+)
diff --git a/bin/syncqt.pl b/bin/syncqt.pl
index cca654e3b4e..93c962cf90c 100755
--- a/bin/syncqt.pl
+++ b/bin/syncqt.pl
@@ -182,6 +182,7 @@ sub shouldMasterInclude {
if (open(F, "<$iheader")) {
while (<F>) {
chomp;
+ chop if /\r$/;
return 0 if (/^\#pragma qt_no_master_include$/);
}
close(F);
--
GitLab