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>
This commit is contained in:
parent
469e293286
commit
38944d662e
@ -182,6 +182,7 @@ sub shouldMasterInclude {
|
|||||||
if (open(F, "<$iheader")) {
|
if (open(F, "<$iheader")) {
|
||||||
while (<F>) {
|
while (<F>) {
|
||||||
chomp;
|
chomp;
|
||||||
|
chop if /\r$/;
|
||||||
return 0 if (/^\#pragma qt_no_master_include$/);
|
return 0 if (/^\#pragma qt_no_master_include$/);
|
||||||
}
|
}
|
||||||
close(F);
|
close(F);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user