From 25844263107e20b7bd1f3fabebf782456e06dbba Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Tue, 30 Oct 2018 15:14:57 +0100 Subject: [PATCH] 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 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- ui/qt/about_dialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 28d84887cb..84f10eac8b 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -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();