diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-02-01 09:21:38 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-02-01 09:21:38 +0000 |
| commit | 8afb6106f2fb565aff0ec9f00b3dcf7217ed5255 (patch) | |
| tree | 0c1ad87b1f25d7fa958e75b6c5e1303bdc810f09 /ui/qt/font_color_preferences_frame.cpp | |
| parent | be111f21926a48813378fa675bbbdd1960726518 (diff) | |
| download | wireshark-8afb6106f2fb565aff0ec9f00b3dcf7217ed5255.tar.gz | |
Fix [ 68%] Building CXX object ui/qt/CMakeFiles/qtui.dir/font_color_preferences_frame.cpp.o ui/qt/font_color_preferences_frame.cpp: In member function ‘void FontColorPreferencesFrame::updateWidgets()’: ui/qt/font_color_preferences_frame.cpp:84:54: error: ‘class QFont’ has no member named ‘styleName’ make[2]: *** [ui/qt/CMakeFiles/qtui.dir/font_color_preferences_frame.cpp.o] Erreur 1 make[1]: *** [ui/qt/CMakeFiles/qtui.dir/all] Error 2
StyleName is not available in Qt < 4.8
disable this line for the moment (maye be add if QTVERSION > 4.8 ?)
svn path=/trunk/; revision=47409
Diffstat (limited to 'ui/qt/font_color_preferences_frame.cpp')
| -rw-r--r-- | ui/qt/font_color_preferences_frame.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/font_color_preferences_frame.cpp b/ui/qt/font_color_preferences_frame.cpp index fa0d0d90c1..007d23408a 100644 --- a/ui/qt/font_color_preferences_frame.cpp +++ b/ui/qt/font_color_preferences_frame.cpp @@ -81,7 +81,7 @@ void FontColorPreferencesFrame::updateWidgets() int margin = style()->pixelMetric(QStyle::PM_LayoutLeftMargin); ui->fontPushButton->setText( - cur_font_.family() + " " + cur_font_.styleName() + " " + + cur_font_.family() + " "/* + cur_font_.styleName() + " "*/ + QString::number(cur_font_.pointSizeF(), 'f', 1)); ui->fontSampleLineEdit->setFont(cur_font_); |