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

Qt: Remove merge issue from Drag Drop 

Remove a remissent merge artefact

Change-Id: I4c53d4b2adef124712091c40efccc1cad3db3301
Reviewed-on: https://code.wireshark.org/review/24521
Reviewed-by: Roland Knall <rknall@gmail.com>
This commit is contained in:
Roland Knall 2017-11-21 10:46:26 +01:00 committed by Roland Knall
parent 3cf73671d1
commit 1470aeef4c
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/qt/widgets/drag_drop_toolbar.cpp
View File

@ -114,10 +114,6 @@ bool DragDropToolBar::eventFilter(QObject * obj, QEvent * event)
if ( ( ev->buttons() & Qt::LeftButton ) && (ev->pos() - dragStartPosition).manhattanLength()
> QApplication::startDragDistance())
{
bool success = false;
if ( ! success )
return false;
ToolbarEntryMimeData * temd =
new ToolbarEntryMimeData(((QToolButton *)elem)->text(), elem->property(drag_drop_toolbar_action_).toInt());
DragLabel * lbl = new DragLabel(temd->labelText(), this);