Skip to content

Commit

Permalink
Fix syncqt.pl not respecting #pragma qt_no_master_include in files wi…
Browse files Browse the repository at this point in the history
…th 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 <[email protected]>
Reviewed-by: Oswald Buddenhagen <[email protected]>
  • Loading branch information
Simon Hausmann authored and Jani Heikkinen committed Feb 25, 2016
1 parent 469e293 commit 38944d6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions bin/syncqt.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 38944d6

Please sign in to comment.