diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-08-08 19:50:24 +0200 |
|---|---|---|
| committer | Christopher Maynard <Christopher.Maynard@gtech.com> | 2014-08-09 14:15:25 +0000 |
| commit | 020d0f89637faab8ec0e25e07d64eb66d96c2a72 (patch) | |
| tree | 8d876df41ab9a02def2d7f9a3e6c34bcd090c3b5 /ui/qt | |
| parent | 6379236e7e5da3d624598e8bcfa422f599bd61b2 (diff) | |
| download | wireshark-020d0f89637faab8ec0e25e07d64eb66d96c2a72.tar.gz | |
Qt: Fix when build with Qt < 4.8.0
StyleName is not available in Qt < 4.8
Change-Id: Icbfcef7c62b124ce67f1a02ed928a96233ae2d9d
Reviewed-on: https://code.wireshark.org/review/3508
Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com>
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/font_color_preferences_frame.cpp | 8 | ||||
| -rw-r--r-- | ui/qt/qt_ui_utils.cpp | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ui/qt/font_color_preferences_frame.cpp b/ui/qt/font_color_preferences_frame.cpp index e9f4a5dd41..38c894cc09 100644 --- a/ui/qt/font_color_preferences_frame.cpp +++ b/ui/qt/font_color_preferences_frame.cpp @@ -81,9 +81,15 @@ void FontColorPreferencesFrame::updateWidgets() { int margin = style()->pixelMetric(QStyle::PM_LayoutLeftMargin); +#if QT_VERSION < QT_VERSION_CHECK(4, 8, 0) ui->fontPushButton->setText( - cur_font_.family() + " "/* + cur_font_.styleName() + " "*/ + + cur_font_.family() + " " + QString::number(cur_font_.pointSizeF(), 'f', 1)); +#else + ui->fontPushButton->setText( + cur_font_.family() + " " + cur_font_.styleName() + " " + + QString::number(cur_font_.pointSizeF(), 'f', 1)); +#endif ui->fontSampleLineEdit->setFont(cur_font_); QString line_edit_ss = QString("QLineEdit { margin-left: %1px; }").arg(margin); diff --git a/ui/qt/qt_ui_utils.cpp b/ui/qt/qt_ui_utils.cpp index 8ad29d277b..f4a0621080 100644 --- a/ui/qt/qt_ui_utils.cpp +++ b/ui/qt/qt_ui_utils.cpp @@ -55,7 +55,11 @@ QString gchar_free_to_qstring(gchar *glib_string) { void smooth_font_size(QFont &font) { QFontDatabase fdb; +#if QT_VERSION < QT_VERSION_CHECK(4, 8, 0) + QList<int> size_list = fdb.smoothSizes(font.family(), ""); +#else QList<int> size_list = fdb.smoothSizes(font.family(), font.styleName()); +#endif if (size_list.size() < 2) return; |