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

Qt: fix compilation with older versions. 

Fix travis linux builds.

../ui/qt/widgets/display_filter_edit.cpp:130:56: error: no matching function for call to ‘QAction::QAction(QString)’
     QAction * na = new QAction(tr("Left align buttons"));
                                                        ^
In file included from /usr/include/x86_64-linux-gnu/qt5/QtWidgets/qactiongroup.h:37,
                 from /usr/include/x86_64-linux-gnu/qt5/QtWidgets/QActionGroup:1,
                 from ../ui/qt/widgets/display_filter_edit.h:14,
                 from ../ui/qt/widgets/display_filter_edit.cpp:20:
/usr/include/x86_64-linux-gnu/qt5/QtWidgets/qaction.h:174:5: note: candidate: ‘QAction::QAction(QActionPrivate&, QObject*)’
     QAction(QActionPrivate &dd, QObject *parent);
     ^~~~~~~

Change-Id: I03be478bc17296cc6adca6df82cdd41bcc0504b4
Reviewed-on: https://code.wireshark.org/review/34995
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
This commit is contained in:
Dario Lombardo 2019-11-06 10:25:37 +00:00 committed by Roland Knall
parent 1178c59c05
commit 88306c251a
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/widgets/display_filter_edit.cpp
View File

@ -131,14 +131,14 @@ void DisplayFilterEdit::contextMenuEvent(QContextMenuEvent *event){
QAction * first = menu->actions().at(0);
QAction * na = new QAction(tr("Left align buttons"));
QAction * na = new QAction(tr("Left align buttons"), this);
na->setCheckable(true);
na->setChecked(leftAlignActions_);
connect(na, &QAction::triggered, this, &DisplayFilterEdit::triggerAlignementAction);
menu->insertAction(first, na);
na = new QAction(tr("Display Filter Expression" UTF8_HORIZONTAL_ELLIPSIS));
na = new QAction(tr("Display Filter Expression" UTF8_HORIZONTAL_ELLIPSIS), this);
connect(na, &QAction::triggered, this, &DisplayFilterEdit::displayFilterExpression);
menu->insertAction(first, na);