diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-22 07:24:57 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-22 07:28:42 +0100 |
commit | a02863234d76abb6c9f289026ae4ea3145924f30 (patch) | |
tree | aef6381d0000a78ba69ac80eb03739b1c8ca5fc3 /bin/syncqt.pl | |
parent | e77b13621f0057374d83a2b884f03dd2e5b7b88c (diff) | |
parent | e4d79e1fdeb6b26ba0b12b578daacf7cd672b960 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
configure
mkspecs/common/wince/qplatformdefs.h
src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
src/plugins/platforms/xcb/qxcbbackingstore.cpp
Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c
Diffstat (limited to 'bin/syncqt.pl')
-rwxr-xr-x | bin/syncqt.pl | 1 |
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); |