diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-09-12 14:16:50 -0600 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-09-12 14:19:29 -0600 |
| commit | f7cdfff6a85ce52b1d7c0b5131645fcb77405fe8 (patch) | |
| tree | 908af9bf8d1c512e22116cb3afbc89eb5883cc93 /gr-qtgui/lib/freq_sink_f_impl.cc | |
| parent | a867a290194228d09ba93f0f46e3a4e4523f5396 (diff) | |
| parent | af4323d1e471476efa255e3df745397f7c8a1b71 (diff) | |
Merge remote-tracking branch 'upstream/next' into gtk3
Diffstat (limited to 'gr-qtgui/lib/freq_sink_f_impl.cc')
| -rw-r--r-- | gr-qtgui/lib/freq_sink_f_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index 90624e78eb..816b37415e 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -153,7 +153,7 @@ namespace gr { d_qApplication = qApp; } else { -#if QT_VERSION >= 0x040500 +#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); QApplication::setGraphicsSystem(QString(style.c_str())); #endif |