[Commit-gnuradio] [gnuradio] branch next-qt5 updated (3c14957 -> cc57ff6)

[git]

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

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

      from  3c14957   Merge branch 'next' into next-qt5
       new  70780d6   Revert "CMake: Remove obsolete GrSetupQt4 module"
       new  22778fb   gr-qtgui: Allow build with Qt4 or Qt5 (default)
       new  9eae37c   cmake: FindQwt: Find the Qwt library that matches the Qt 
version
       new  c76a7e0   gr-qtgui: Fix PyQt[4,5] include in XMLs for GRC
       new  fef76c2   gr-qtgui: Fix range.py to work with both Qt4 and Qt5
       new  00939e9   gr-qtgui: Re-introduce some Qt4-specific code
       new  0bf66e0   grc: Fix generation of Python code for Qt4 and Qt5
       new  a63f6c6   qtgui: tolerate return of NoneType when setting not found
       new  cc57ff6   Merge branch 'adi-qt5' into next-qt5

The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 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(-)
 create mode 100644 cmake/Modules/GrSetupQt4.cmake
 rename gr-qtgui/grc/{qtgui_ber_sink_b.xml => qtgui_ber_sink_b.xml.cmakein} 
(99%)
 rename gr-qtgui/grc/{qtgui_block_tree.xml => qtgui_block_tree.xml.cmakein} 
(100%)
 rename gr-qtgui/grc/{qtgui_check_box.xml => qtgui_check_box.xml.cmakein} (97%)
 rename gr-qtgui/grc/{qtgui_chooser.xml => qtgui_chooser.xml.cmakein} (98%)
 rename gr-qtgui/grc/{qtgui_const_sink_x.xml => qtgui_const_sink_x.xml.cmakein} 
(99%)
 rename gr-qtgui/grc/{qtgui_edit_box_msg.xml => qtgui_edit_box_msg.xml.cmakein} 
(98%)
 rename gr-qtgui/grc/{qtgui_entry.xml => qtgui_entry.xml.cmakein} (97%)
 rename gr-qtgui/grc/{qtgui_freq_sink_x.xml => qtgui_freq_sink_x.xml.cmakein} 
(99%)
 rename gr-qtgui/grc/{qtgui_histogram_sink_x.xml => 
qtgui_histogram_sink_x.xml.cmakein} (99%)
 rename gr-qtgui/grc/{qtgui_label.xml => qtgui_label.xml.cmakein} (97%)
 rename gr-qtgui/grc/{qtgui_number_sink.xml => qtgui_number_sink.xml.cmakein} 
(99%)
 rename gr-qtgui/grc/{qtgui_push_button.xml => qtgui_push_button.xml.cmakein} 
(97%)
 rename gr-qtgui/grc/{qtgui_range.xml => qtgui_range.xml.cmakein} (100%)
 rename gr-qtgui/grc/{qtgui_sink_x.xml => qtgui_sink_x.xml.cmakein} (98%)
 rename gr-qtgui/grc/{qtgui_tab_widget.xml => qtgui_tab_widget.xml.cmakein} 
(99%)
 rename gr-qtgui/grc/{qtgui_time_raster_x.xml => 
qtgui_time_raster_x.xml.cmakein} (99%)
 rename gr-qtgui/grc/{qtgui_time_sink_x.xml => qtgui_time_sink_x.xml.cmakein} 
(99%)
 rename gr-qtgui/grc/{qtgui_vector_sink_f.xml => 
qtgui_vector_sink_f.xml.cmakein} (99%)
 rename gr-qtgui/grc/{qtgui_waterfall_sink_x.xml => 
qtgui_waterfall_sink_x.xml.cmakein} (99%)
 rename gr-qtgui/python/qtgui/{range.py => range.py.cmakein} (99%)
 rename grc/blocks/{options.xml => options.xml.cmakein} (99%)