osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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:
Peter Wu 2018-10-30 15:14:57 +01:00 committed by Anders Broman
parent b66a76ae84
commit 2584426310
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/qt/about_dialog.cpp
View File

@ -84,7 +84,7 @@ AStringListListModel(parent)
if ( line.startsWith("------") )
continue;
if ( line == "= Acknowledgements =" )
if ( line.contains("Acknowledgements") )
{
readAck = true;
continue;
@ -92,7 +92,7 @@ AStringListListModel(parent)
else if ( rx.indexIn(line) != -1 )
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));
}
f_authors.close();