diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-09-04 09:22:41 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-09-04 16:30:15 +0000 |
| commit | a69a515f287f1e8a43b5b9034eebdfc56a29a1c9 (patch) | |
| tree | 498e52964f28e49d3fd832e7ecfe287d9b490289 | |
| parent | f5ac9f55c48212578f9da46eef26581ce20d5577 (diff) | |
| download | wireshark-a69a515f287f1e8a43b5b9034eebdfc56a29a1c9.tar.gz | |
Add a version check to our splitter styling.
According to https://bugreports.qt.io/browse/QTBUG-43425 the OS X
splitter rendering issue will be fixed in Qt 5.6.
Change-Id: I99e000d96f8f61cd654be3808fd79577bac11d88
Reviewed-on: https://code.wireshark.org/review/10381
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | ui/qt/wireshark_application.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp index eb85278e56..50fe3fff0b 100644 --- a/ui/qt/wireshark_application.cpp +++ b/ui/qt/wireshark_application.cpp @@ -616,7 +616,7 @@ WiresharkApplication::WiresharkApplication(int &argc, char **argv) : // Application-wide style sheet QString app_style_sheet = qApp->styleSheet(); -#if defined(Q_OS_MAC) +#if defined(Q_OS_MAC) && QT_VERSION < QT_VERSION_CHECK(5, 6, 0) // Qt uses the HITheme API to draw splitters. In recent versions of OS X // this looks particularly bad: https://bugreports.qt.io/browse/QTBUG-43425 // This doesn't look native but it looks better than Yosemite's bit-rotten |