diff options
| author | Roland Knall <roland.knall@br-automation.com> | 2018-04-05 15:12:39 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2018-04-05 18:48:57 +0000 |
| commit | 3a928f1f879cfc63580181a316229733f8b81b0e (patch) | |
| tree | ed3cb6334edf78751cceadd4702234b1727fec94 /ui/qt/utils | |
| parent | c4da7ed843527ac75bc46d74e43de1b61fa5c5f5 (diff) | |
Qt: Remove checks for version below 5.2
This stops the main source from being buildable by Qt 4.x
Change-Id: I61edbae04ac2b3bf0ae8ee8e09d335083945c176
Reviewed-on: https://code.wireshark.org/review/26756
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'ui/qt/utils')
| -rw-r--r-- | ui/qt/utils/qt_ui_utils.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ui/qt/utils/qt_ui_utils.cpp b/ui/qt/utils/qt_ui_utils.cpp index 13553e96c5..ea176946ff 100644 --- a/ui/qt/utils/qt_ui_utils.cpp +++ b/ui/qt/utils/qt_ui_utils.cpp @@ -34,11 +34,6 @@ #include <QUrl> #include <QUuid> -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) -// Qt::escape -#include <QTextDocument> -#endif - /* Make the format_size_flags_e enum usable in C++ */ format_size_flags_e operator|(format_size_flags_e lhs, format_size_flags_e rhs) { return (format_size_flags_e) ((int)lhs| (int)rhs); @@ -169,11 +164,7 @@ const QString time_t_to_qstring(time_t ti_time) } QString html_escape(const QString plain_string) { -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - return Qt::escape(plain_string); -#else return plain_string.toHtmlEscaped(); -#endif } |