diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-28 11:51:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-28 11:51:35 +0200 |
| commit | e918334045612ec2c7c6203845ad05c4a1972e87 (patch) | |
| tree | b59bf3a173c6bfa58c3ba9b5bb80df4a093247dc /bin | |
| parent | e3cbf0f1962958457f6e09fcfdc92d8cac4b6511 (diff) | |
| parent | cf0119bb69592d58ca7e6a75753799ebae61e4b5 (diff) | |
| download | qtbase-e918334045612ec2c7c6203845ad05c4a1972e87.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/widgets/dialogs/qcolordialog.cpp
src/widgets/dialogs/qfiledialog.cpp
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
Change-Id: I34bc8a990f8f526889a95a5c7099ef557b9681ad
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/syncqt.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 0c10ccbe14..97288c5a3e 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -231,7 +231,7 @@ sub classNames { } if($line) { $line =~ s,//.*$,,; #remove c++ comments - $line .= ";" if($line =~ m/^Q_[A-Z_]*\(.*\)[\r\n]*$/); #qt macro + $line .= ";" if($line =~ m/^Q_[A-Z_0-9]*\(.*\)[\r\n]*$/); #qt macro $line .= ";" if($line =~ m/^QT_(BEGIN|END)_HEADER[\r\n]*$/); #qt macro $line .= ";" if($line =~ m/^QT_(BEGIN|END)_NAMESPACE(_[A-Z]+)*[\r\n]*$/); #qt macro $line .= ";" if($line =~ m/^QT_MODULE\(.*\)[\r\n]*$/); # QT_MODULE macro @@ -362,7 +362,7 @@ sub check_header { $include = 0; } if ($include && $public_header) { - print STDERR "$lib: ERROR: $iheader includes private header $include\n" if ($include =~ /_p.h$/); + print STDERR "$lib: ERROR: $iheader includes private header $include\n" if ($include =~ /_p\.h$/); for my $trylib (keys(%modules)) { if (-e "$out_basedir/include/$trylib/$include") { print STDERR "$lib: WARNING: $iheader includes $include when it should include $trylib/$include\n"; @@ -989,7 +989,7 @@ foreach my $lib (@modules_to_sync) { my $header_dirname = ""; foreach my $header (@headers) { my $shadow = ($header =~ s/^\*//); - $header = 0 if($header =~ /^ui_.*.h/); + $header = 0 if ($header =~ /^ui_.*\.h$/); foreach (@ignore_headers) { $header = 0 if($header eq $_); } @@ -1001,7 +1001,7 @@ foreach my $lib (@modules_to_sync) { if(isQpaHeader($public_header)) { $public_header = 0; $qpa_header = 1; - } elsif($allheadersprivate || $thisprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) { + } elsif ($allheadersprivate || $thisprivate || $public_header =~ /_p(ch)?\.h$/) { $public_header = 0; } else { foreach (@ignore_for_master_contents) { |