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

Fix a compile error occurring on RedHat Enterprise Linux Workstation release 7.0 (Maipo). 

This fixes a compile error with Qt version 4.8.5-8 as installed in RHEL 7.0:

  sequence_dialog.cpp: In member function 'void SequenceDialog::mouseMoved(QMouseEvent*)':
  sequence_dialog.cpp:306:35: error: 'escape' is not a member of 'Qt'
             QString raw_comment = Qt::escape(sai->comment);
                                   ^

Change-Id: Ibbf62123441645471d66aa329f0d63d0ee198017
Reviewed-on: https://code.wireshark.org/review/15682
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
This commit is contained in:
Jens Kilian 2016-06-01 16:05:01 +02:00 committed by Gerald Combs
parent 6fa77a6acb
commit 76ef2d2a3d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/qt/sequence_dialog.cpp
View File

@ -36,6 +36,10 @@
#include <QFileDialog>
#include <QFontMetrics>
#include <QPoint>
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
// Qt::escape
#include <QTextDocument>
#endif
// To do:
// - Resize or show + hide the Time and Comment axes, possibly via one of