diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-26 16:20:28 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-26 16:20:53 +0000 |
| commit | d12c3e77b87f2c74d252b4b0991d8bc33711d413 (patch) | |
| tree | 0f19624112bbcba5304cecff5d26245a91d2d013 /scripts | |
| parent | 09310bcdc68e4242106e3f15761116797f8f0d78 (diff) | |
qdoc2tasks.pl: Adapt to changed message format in Qt 5.11
Account for the additional '(qdoc)'.
Change-Id: Ibef4dfba66bcc2eb1d47535b9e6501ed3a47e968
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/qdoc2tasks.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/qdoc2tasks.pl b/scripts/qdoc2tasks.pl index 066a857c27..244a0a13a4 100755 --- a/scripts/qdoc2tasks.pl +++ b/scripts/qdoc2tasks.pl @@ -41,8 +41,9 @@ use warnings; while (my $line = <STDIN>) { chomp($line); # --- extract file name based matching: - # D:/.../qaxbase.cpp:3231: warning: Cannot tie this documentation to anything - if ($line =~ /^(..[^:]*):(\d+): warning: (.*)$/) { + # Qt 5.10: D:/.../qaxbase.cpp:3231: warning: Cannot tie this documentation to anything + # Qt 5.11: D:/.../qaxbase.cpp:3231: (qdoc) warning: Cannot tie this documentation to anything + if ($line =~ /^(..[^:]*):(\d+): (?:\(qdoc\) )?warning: (.*)$/) { my $fileName = $1; my $lineNumber = $2; my $text = $3; |