[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'next-qt5' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'next-qt5' into next |
|
Date: |
Thu, 25 Aug 2016 00:32:22 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit a7a57791d452fb2543de178ae72cfd63581bf80e
Merge: 9404180 22e3ee0
Author: Johnathan Corgan <address@hidden>
Date: Wed Aug 24 15:40:00 2016 -0700
Merge branch 'next-qt5' into next
CMakeLists.txt | 4 +-
cmake/Modules/FindQwt.cmake | 14 +-
gr-qtgui/CMakeLists.txt | 30 +-
gr-qtgui/examples/c++/CMakeLists.txt | 8 +-
gr-qtgui/examples/pyqt_const_c.py | 62 +-
gr-qtgui/examples/pyqt_example_c.py | 59 +-
gr-qtgui/examples/pyqt_example_f.py | 59 +-
gr-qtgui/examples/pyqt_freq_c.py | 59 +-
gr-qtgui/examples/pyqt_freq_f.py | 60 +-
gr-qtgui/examples/pyqt_histogram_f.py | 73 +-
gr-qtgui/examples/pyqt_time_c.py | 66 +-
gr-qtgui/examples/pyqt_time_f.py | 67 +-
gr-qtgui/examples/pyqt_time_raster_b.py | 19 +-
gr-qtgui/examples/pyqt_time_raster_f.py | 19 +-
gr-qtgui/examples/pyqt_waterfall_c.py | 59 +-
gr-qtgui/examples/pyqt_waterfall_f.py | 62 +-
gr-qtgui/examples/qtgui_tags_viewing.grc | 2399 +++++++++++++++-----
gr-qtgui/grc/CMakeLists.txt | 9 +-
...ber_sink_b.xml => qtgui_ber_sink_b.xml.cmakein} | 2 +-
...block_tree.xml => qtgui_block_tree.xml.cmakein} | 0
...i_check_box.xml => qtgui_check_box.xml.cmakein} | 2 +-
...qtgui_chooser.xml => qtgui_chooser.xml.cmakein} | 4 +-
...t_sink_x.xml => qtgui_const_sink_x.xml.cmakein} | 2 +-
..._box_msg.xml => qtgui_edit_box_msg.xml.cmakein} | 2 +-
.../{qtgui_entry.xml => qtgui_entry.xml.cmakein} | 2 +-
...eq_sink_x.xml => qtgui_freq_sink_x.xml.cmakein} | 2 +-
...nk_x.xml => qtgui_histogram_sink_x.xml.cmakein} | 2 +-
.../{qtgui_label.xml => qtgui_label.xml.cmakein} | 2 +-
...mber_sink.xml => qtgui_number_sink.xml.cmakein} | 2 +-
...sh_button.xml => qtgui_push_button.xml.cmakein} | 2 +-
.../{qtgui_range.xml => qtgui_range.xml.cmakein} | 0
.../{qtgui_sink_x.xml => qtgui_sink_x.xml.cmakein} | 2 +-
...tab_widget.xml => qtgui_tab_widget.xml.cmakein} | 2 +-
...aster_x.xml => qtgui_time_raster_x.xml.cmakein} | 2 +-
...me_sink_x.xml => qtgui_time_sink_x.xml.cmakein} | 2 +-
..._sink_f.xml => qtgui_vector_sink_f.xml.cmakein} | 2 +-
...nk_x.xml => qtgui_waterfall_sink_x.xml.cmakein} | 2 +-
gr-qtgui/include/QtWidgets/QRegExpValidator | 9 +
gr-qtgui/include/gnuradio/qtgui/form_menus.h | 5 +
gr-qtgui/lib/CMakeLists.txt | 10 +-
gr-qtgui/lib/SpectrumGUIClass.cc | 1 -
gr-qtgui/lib/const_sink_c_impl.cc | 2 +-
gr-qtgui/lib/edit_box_msg_impl.cc | 4 -
gr-qtgui/lib/freq_sink_c_impl.cc | 2 +-
gr-qtgui/lib/freq_sink_f_impl.cc | 2 +-
gr-qtgui/lib/histogram_sink_f_impl.cc | 2 +-
gr-qtgui/lib/sink_c_impl.cc | 2 +-
gr-qtgui/lib/sink_f_impl.cc | 2 +-
gr-qtgui/lib/time_raster_sink_b_impl.cc | 2 +-
gr-qtgui/lib/time_raster_sink_f_impl.cc | 2 +-
gr-qtgui/lib/time_sink_c_impl.cc | 2 +-
gr-qtgui/lib/time_sink_f_impl.cc | 2 +-
gr-qtgui/lib/vector_sink_f_impl.cc | 2 +-
gr-qtgui/lib/waterfall_sink_c_impl.cc | 2 +-
gr-qtgui/lib/waterfall_sink_f_impl.cc | 2 +-
gr-qtgui/python/qtgui/CMakeLists.txt | 10 +-
.../python/qtgui/{range.py => range.py.cmakein} | 27 +-
grc/blocks/CMakeLists.txt | 4 +-
grc/blocks/{options.xml => options.xml.cmakein} | 2 +-
grc/core/generator/flow_graph.tmpl | 18 +-
60 files changed, 2304 insertions(+), 976 deletions(-)