diff options
author | Peter Wu <peter@lekensteyn.nl> | 2016-10-19 12:27:11 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-10-20 05:03:07 +0000 |
commit | 9c3d81adde2d901a18fb0dc5a5dc2220f76cd920 (patch) | |
tree | cebcb733c078e2fce37acdecbd99713d71629dc0 /ui/qt/stock_icon.cpp | |
parent | d38ed8e55f7df9b34b9a7859ff54dde726f2feb0 (diff) |
Officially require Qt 4.8 or newer
Since v2.3.0rc0-1002-g1cd2255, Qt 4.8 became mandatory, reflect this in
the version requirements. This will not affect a lot of distributions
(RHEL and SLES only had Qt 4.6).
For a more complete list of supported platforms, see
https://wiki.wireshark.org/Development/Support_library_version_tracking
While at it, correct some other minimum versions in documentation.
Change-Id: I11f2dfba72c75429f6838404a81ed3b3dc302d5f
Reviewed-on: https://code.wireshark.org/review/18314
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/stock_icon.cpp')
-rw-r--r-- | ui/qt/stock_icon.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/qt/stock_icon.cpp b/ui/qt/stock_icon.cpp index ee7231593d..cc1da56564 100644 --- a/ui/qt/stock_icon.cpp +++ b/ui/qt/stock_icon.cpp @@ -75,18 +75,14 @@ StockIcon::StockIcon(const QString icon_name) : // X11 only as per the QIcon documentation. if (hasThemeIcon(icon_name)) { QIcon theme_icon = fromTheme(icon_name); -#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0) swap(theme_icon); -#endif return; } // Is this is an icon we've manually mapped to a standard pixmap below? if (icon_name_to_standard_pixmap_.contains(icon_name)) { QIcon standard_icon = wsApp->style()->standardIcon(icon_name_to_standard_pixmap_[icon_name]); -#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0) swap(standard_icon); -#endif return; } |