diff options
| -rw-r--r-- | config/grc_gr_qtgui.m4 | 12 | ||||
| -rwxr-xr-x | gr-qtgui/apps/pyqt_example_c.py | 3 | ||||
| -rwxr-xr-x | gr-qtgui/apps/pyqt_example_f.py | 4 | ||||
| -rwxr-xr-x | gr-qtgui/apps/qt_digital.py | 1 | ||||
| -rw-r--r-- | grc/python/flow_graph.tmpl | 1 |
5 files changed, 12 insertions, 9 deletions
diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4 index a4592fa41..ddb7c7ca9 100644 --- a/config/grc_gr_qtgui.m4 +++ b/config/grc_gr_qtgui.m4 @@ -47,12 +47,12 @@ AC_DEFUN([GRC_GR_QTGUI],[ if test $passed = yes; then dnl Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS - PKG_CHECK_MODULES(QTCORE, QtCore >= 4.2, [], - [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtCore >= 4.2.])]) - PKG_CHECK_MODULES(QTGUI, QtGui >= 4.2, [], - [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtGui >= 4.2.])]) - PKG_CHECK_MODULES(QTOPENGL, QtOpenGL >= 4.2, [], - [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtOpenGL >- 4.2.])]) + PKG_CHECK_MODULES(QTCORE, QtCore >= 4.4, [], + [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtCore >= 4.4.])]) + PKG_CHECK_MODULES(QTGUI, QtGui >= 4.4, [], + [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtGui >= 4..])]) + PKG_CHECK_MODULES(QTOPENGL, QtOpenGL >= 4.4, [], + [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtOpenGL >- 4.4.])]) dnl Fetch QWT variables GR_QWT([], [passed=no]) diff --git a/gr-qtgui/apps/pyqt_example_c.py b/gr-qtgui/apps/pyqt_example_c.py index e1b58442f..607ab12ee 100755 --- a/gr-qtgui/apps/pyqt_example_c.py +++ b/gr-qtgui/apps/pyqt_example_c.py @@ -145,5 +145,6 @@ class my_top_block(gr.top_block): if __name__ == "__main__": tb = my_top_block(); tb.start() - sys.exit(tb.qapp.exec_()) + tb.qapp.exec_() + tb.stop() diff --git a/gr-qtgui/apps/pyqt_example_f.py b/gr-qtgui/apps/pyqt_example_f.py index 6b2131019..9e5d04008 100755 --- a/gr-qtgui/apps/pyqt_example_f.py +++ b/gr-qtgui/apps/pyqt_example_f.py @@ -144,5 +144,5 @@ class my_top_block(gr.top_block): if __name__ == "__main__": tb = my_top_block(); tb.start() - sys.exit(tb.qapp.exec_()) - + tb.qapp.exec_() + tb.stop() diff --git a/gr-qtgui/apps/qt_digital.py b/gr-qtgui/apps/qt_digital.py index c6920a05d..99c799f2a 100755 --- a/gr-qtgui/apps/qt_digital.py +++ b/gr-qtgui/apps/qt_digital.py @@ -274,3 +274,4 @@ if __name__ == "__main__": tb = my_top_block(); tb.start() tb.qapp.exec_() + tb.stop() diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl index e16e86f5b..7a74cf84c 100644 --- a/grc/python/flow_graph.tmpl +++ b/grc/python/flow_graph.tmpl @@ -242,6 +242,7 @@ if __name__ == '__main__': #end if tb.show() qapp.exec_() + tb.stop() #elif $generate_options == 'no_gui' tb = $(class_name)($(', '.join($params_eq_list))) #set $run_options = $flow_graph.get_option('run_options') |