diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-25 18:00:30 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-25 18:00:30 -0400 |
| commit | 2b8888e03a4c8fff9527694a7f4526733eeb219f (patch) | |
| tree | 2703b80fb6d8c69ee829975208a4b5d6296f7955 /grc/python | |
| parent | 20530e6f7161c5ebd43c2344f411be5d05e9eafa (diff) | |
| parent | 5c3c34544248e1fa9aec8733012ea968acd03498 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'grc/python')
| -rw-r--r-- | grc/python/flow_graph.tmpl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl index 52582384aa..ace217c967 100644 --- a/grc/python/flow_graph.tmpl +++ b/grc/python/flow_graph.tmpl @@ -58,6 +58,7 @@ class $(class_name)(grc_wxgui.top_block_gui): self.SetIcon(wx.Icon(_icon_path, wx.BITMAP_TYPE_ANY)) #end if #elif $generate_options == 'qt_gui' +from distutils.version import StrictVersion class $(class_name)(gr.top_block, Qt.QWidget): def __init__($param_str): @@ -316,7 +317,8 @@ if __name__ == '__main__': tb.Wait() #end if #elif $generate_options == 'qt_gui' - Qt.QApplication.setGraphicsSystem(gr.prefs().get_string('qtgui','style','raster')) + if(StrictVersion(Qt.qVersion()) >= StrictVersion("4.5.0")): + Qt.QApplication.setGraphicsSystem(gr.prefs().get_string('qtgui','style','raster')) qapp = Qt.QApplication(sys.argv) tb = $(class_name)($(', '.join($params_eq_list))) #if $flow_graph.get_option('run') |