diff options
author | Gerald Combs <gerald@wireshark.org> | 2013-01-24 23:50:01 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2013-01-24 23:50:01 +0000 |
commit | 4b99b36fed27fca7deef9c3a0ef2947bbae9a0e6 (patch) | |
tree | 8d33aefcbf00617266daa4185a4b77934f33b4b6 /ui/qt/wireshark_application.cpp | |
parent | d6de7982265e04402b8c2b7062ad4b586943bf18 (diff) | |
download | wireshark-4b99b36fed27fca7deef9c3a0ef2947bbae9a0e6.tar.gz |
Add back the X11 substitutes.
svn path=/trunk/; revision=47264
Diffstat (limited to 'ui/qt/wireshark_application.cpp')
-rw-r--r-- | ui/qt/wireshark_application.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp index d0d200e674..0c3732f4ae 100644 --- a/ui/qt/wireshark_application.cpp +++ b/ui/qt/wireshark_application.cpp @@ -309,7 +309,6 @@ void WiresharkApplication::helpTopicAction(topic_action_e action) } } - void WiresharkApplication::setMonospaceFont(const char *font_string) { if (font_string && strlen(font_string) > 0) { @@ -333,13 +332,14 @@ void WiresharkApplication::setMonospaceFont(const char *font_string) { // Try to pick the latest, shiniest fixed-width font for our OS. #if defined(Q_WS_WIN) const char *default_font = win_default_font; + substitutes << win_alt_font << osx_default_font << osx_alt_font << x11_default_font << x11_alt_fonts << fallback_fonts; font_size_adjust = 2; - substitutes = QStringList() << win_alt_font << osx_default_font << osx_alt_font << x11_default_font << x11_alt_fonts << fallback_fonts; #elif defined(Q_WS_MAC) const char *default_font = osx_default_font; - substitutes = QStringList() << osx_alt_font << win_default_font << win_alt_font << x11_default_font << x11_alt_fonts << fallback_fonts; + substitutes << osx_alt_font << win_default_font << win_alt_font << x11_default_font << x11_alt_fonts << fallback_fonts; #else const char *default_font = x11_default_font; + substitutes << x11_alt_fonts << win_default_font << win_alt_font << osx_default_font << osx_alt_font << fallback_fonts; #endif mono_regular_font_.setFamily(default_font); |