diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-17 07:57:24 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-17 07:57:24 -0700 |
| commit | 58bed0d449c663701a348461d1f9e6b6f4b94c18 (patch) | |
| tree | 506ee6c2e3030a49612c0642657d31c8437b6316 /gr-qtgui/lib/edit_box_msg_impl.cc | |
| parent | d806c4f416302f09292bbc5fb96647382368424d (diff) | |
| parent | 6431a11b26cec7162e520d4eba0efbd2cfb4ba5c (diff) | |
Merge branch 'master' into next
Conflicts:
gr-qtgui/python/qtgui/CMakeLists.txt
gr-qtgui/python/qtgui/range.py.cmakein
grc/core/generator/flow_graph.tmpl
Diffstat (limited to 'gr-qtgui/lib/edit_box_msg_impl.cc')
| -rw-r--r-- | gr-qtgui/lib/edit_box_msg_impl.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc index e0b5f256b6..0dee1fa18b 100644 --- a/gr-qtgui/lib/edit_box_msg_impl.cc +++ b/gr-qtgui/lib/edit_box_msg_impl.cc @@ -69,11 +69,7 @@ namespace gr { } // If a style sheet is set in the prefs file, enable it here. - std::string qssfile = prefs::singleton()->get_string("qtgui","qss",""); - if(qssfile.size() > 0) { - QString sstext = get_qt_style_sheet(QString(qssfile.c_str())); - d_qApplication->setStyleSheet(sstext); - } + check_set_qss(d_qApplication); d_is_pair = is_pair; d_is_static = is_static; |