URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9efee4b9d52ca34cecb7089e0f74583cea760f09
Submitter: Jaap Keuter (jaap.keuter@xxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark
Commits:
9efee4b by Martin Kaiser (wireshark@xxxxxxxxx):
extcap: fix a compile error with Qt4
declare ExtcapArgument * as a metatype so it can be used by QVariant
CXX extcap_argument.moc.o
In file included from /usr/include/qt4/QtCore/qvariant.h:48:0,
from /usr/include/qt4/QtCore/qabstractitemmodel.h:45,
from /usr/include/qt4/QtGui/qabstractitemview.h:46,
from /usr/include/qt4/QtGui/qtreeview.h:45,
from /usr/include/qt4/QtGui/qtreewidget.h:45,
from /usr/include/qt4/QtGui/QTreeWidget:1,
from ./interface_tree.h:38,
from ./extcap_options_dialog.h:35,
from extcap_options_dialog.cpp:26:
/usr/include/qt4/QtCore/qmetatype.h: In instantiation of ‘static int QMetaTypeId2<T>::qt_metatype_id() [with T = ExtcapArgument*]’:
/usr/include/qt4/QtCore/qmetatype.h:230:44: required from ‘int qMetaTypeId(T*) [with T = ExtcapArgument*]’
/usr/include/qt4/QtCore/qvariant.h:341:47: required from ‘bool QVariant::canConvert() const [with T = ExtcapArgument*]’
extcap_options_dialog.cpp:378:74: required from here /usr/include/qt4/QtCore/qmetatype.h:169:80: error: ‘qt_metatype_id’ is not a member of ‘QMetaTypeId<ExtcapArgument*>’
make[2]: *** [extcap_options_dialog.o] Error 1
Change-Id: Ib7d052a5cb550ab2595b8d9580d35ffeb62093da
Reviewed-on: https://code.wireshark.org/review/16799
Reviewed-by: Martin Kaiser <wireshark@xxxxxxxxx>
Petri-Dish: Martin Kaiser <wireshark@xxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
(cherry picked from commit 63c5216843e84f07089903e330bb75e67ce114aa)
Reviewed-on: https://code.wireshark.org/review/17009
Petri-Dish: Roland Knall <rknall@xxxxxxxxx>
Reviewed-by: Jaap Keuter <jaap.keuter@xxxxxxxxx>
Actions performed:
from 074f310 QUIC: Fix dissection of ACK frame with Q034
adds 9efee4b extcap: fix a compile error with Qt4
Summary of changes:
ui/qt/extcap_argument.h | 1 +
1 file changed, 1 insertion(+)