diff options
author | Jens Kilian <jens.kilian@advantest.com> | 2016-06-01 16:05:01 +0200 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2016-06-01 17:30:37 +0000 |
commit | 76ef2d2a3dff61f523cacc0ac868f5cc2b8f5a5f (patch) | |
tree | 43644829ca2fbf66ae0bf9c3e00cbf9c9eb558c9 /ui/qt/sequence_dialog.cpp | |
parent | 6fa77a6acb7955c804ec73a571177163ad022623 (diff) | |
download | wireshark-76ef2d2a3dff61f523cacc0ac868f5cc2b8f5a5f.tar.gz |
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>
Diffstat (limited to 'ui/qt/sequence_dialog.cpp')
-rw-r--r-- | ui/qt/sequence_dialog.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/qt/sequence_dialog.cpp b/ui/qt/sequence_dialog.cpp index 7b1e889eae..4f824e9828 100644 --- a/ui/qt/sequence_dialog.cpp +++ b/ui/qt/sequence_dialog.cpp @@ -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 |