forked from osmocom/wireshark
Qt: omit initial empty line in About Dialog / Acknowledgements
Follow the logic in tools/generate_authors.pl for matching the Acknowledgements section (which looks for a substring match instead of a literal string. Change-Id: I42e1553b6820af3fb2d5b9cda0fa0e6e6ca7e729 Reviewed-on: https://code.wireshark.org/review/30432 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
parent
b66a76ae84
commit
2584426310
|
@ -84,7 +84,7 @@ AStringListListModel(parent)
|
||||||
if ( line.startsWith("------") )
|
if ( line.startsWith("------") )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if ( line == "= Acknowledgements =" )
|
if ( line.contains("Acknowledgements") )
|
||||||
{
|
{
|
||||||
readAck = true;
|
readAck = true;
|
||||||
continue;
|
continue;
|
||||||
|
@ -92,7 +92,7 @@ AStringListListModel(parent)
|
||||||
else if ( rx.indexIn(line) != -1 )
|
else if ( rx.indexIn(line) != -1 )
|
||||||
appendRow( QStringList() << rx.cap(1).trimmed() << rx.cap(2).trimmed());
|
appendRow( QStringList() << rx.cap(1).trimmed() << rx.cap(2).trimmed());
|
||||||
|
|
||||||
if ( readAck )
|
if ( readAck && (!line.isEmpty() || !acknowledgement_.isEmpty()) )
|
||||||
acknowledgement_.append(QString("%1\n").arg(line));
|
acknowledgement_.append(QString("%1\n").arg(line));
|
||||||
}
|
}
|
||||||
f_authors.close();
|
f_authors.close();
|
||||||
|
|
Loading…
Reference in New Issue