summaryrefslogtreecommitdiffstats
path: root/bin/syncqt.pl
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2016-02-24 12:57:18 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-02-25 16:25:37 +0000
commit38944d662eda76ecc57cb1fd61da42775fa52f6f (patch)
tree6f0d9c97539d952a414ac7c5ff9602012f8436ff /bin/syncqt.pl
parent469e293286f7b9ea093fdac41938e00082c70bcd (diff)
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>
Diffstat (limited to 'bin/syncqt.pl')
-rwxr-xr-xbin/syncqt.pl1
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl
index cca654e3b4..93c962cf90 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);