[Commit-gnuradio] [gnuradio] 09/09: Merge branch 'adi-qt5' into next-qt5

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next-qt5
in repository gnuradio.

commit cc57ff6ceddb5172333bbafe5bb153e807bb9a82
Merge: 3c14957 a63f6c6
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jun 22 14:00:44 2016 -0700

    Merge branch 'adi-qt5' into next-qt5

 CMakeLists.txt                                     |   2 +-
 cmake/Modules/FindQwt.cmake                        |  12 +-
 cmake/Modules/GrSetupQt4.cmake                     | 150 +++++++++++++++++++++
 gr-qtgui/CMakeLists.txt                            |  27 +++-
 gr-qtgui/examples/c++/CMakeLists.txt               |  11 +-
 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/gnuradio/qtgui/form_menus.h       |   4 +
 gr-qtgui/lib/CMakeLists.txt                        |  14 +-
 gr-qtgui/lib/const_sink_c_impl.cc                  |   4 +
 gr-qtgui/lib/freq_sink_c_impl.cc                   |   4 +
 gr-qtgui/lib/freq_sink_f_impl.cc                   |   4 +
 gr-qtgui/lib/histogram_sink_f_impl.cc              |   4 +
 gr-qtgui/lib/sink_c_impl.cc                        |   4 +
 gr-qtgui/lib/sink_f_impl.cc                        |   4 +
 gr-qtgui/lib/time_raster_sink_b_impl.cc            |   4 +
 gr-qtgui/lib/time_raster_sink_f_impl.cc            |   4 +
 gr-qtgui/lib/time_sink_c_impl.cc                   |   4 +
 gr-qtgui/lib/time_sink_f_impl.cc                   |   4 +
 gr-qtgui/lib/vector_sink_f_impl.cc                 |   4 +
 gr-qtgui/lib/waterfall_sink_c_impl.cc              |   4 +
 gr-qtgui/lib/waterfall_sink_f_impl.cc              |   4 +
 gr-qtgui/python/qtgui/CMakeLists.txt               |  10 +-
 .../python/qtgui/{range.py => range.py.cmakein}    |   3 +-
 grc/blocks/CMakeLists.txt                          |   4 +-
 grc/blocks/{options.xml => options.xml.cmakein}    |   2 +-
 grc/core/generator/flow_graph.tmpl                 |  16 ++-
 45 files changed, 309 insertions(+), 43 deletions(-)