[Commit-gnuradio] [gnuradio] 08/08: Merge remote-tracking branch 'tom/qt5_next' 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 480420dc0a348328ff6460aa4bad902f1cca75cc
Merge: 2333700 7bc999f
Author: Johnathan Corgan <address@hidden>
Date:   Sat Nov 28 13:20:15 2015 -0800

    Merge remote-tracking branch 'tom/qt5_next' into next-qt5

 CMakeLists.txt                               |    2 +-
 cmake/Modules/FindQwt.cmake                  |    6 +-
 cmake/Modules/GrSetupQt4.cmake               |  150 --
 gr-qtgui/CMakeLists.txt                      |   11 +-
 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/qtgui_ber_sink_b.xml            |    2 +-
 gr-qtgui/grc/qtgui_check_box.xml             |    2 +-
 gr-qtgui/grc/qtgui_chooser.xml               |    4 +-
 gr-qtgui/grc/qtgui_const_sink_x.xml          |    2 +-
 gr-qtgui/grc/qtgui_entry.xml                 |    2 +-
 gr-qtgui/grc/qtgui_freq_sink_x.xml           |    2 +-
 gr-qtgui/grc/qtgui_histogram_sink_x.xml      |    2 +-
 gr-qtgui/grc/qtgui_label.xml                 |    2 +-
 gr-qtgui/grc/qtgui_number_sink.xml           |    2 +-
 gr-qtgui/grc/qtgui_push_button.xml           |    2 +-
 gr-qtgui/grc/qtgui_sink_x.xml                |    2 +-
 gr-qtgui/grc/qtgui_tab_widget.xml            |    2 +-
 gr-qtgui/grc/qtgui_time_raster_x.xml         |    2 +-
 gr-qtgui/grc/qtgui_time_sink_x.xml           |    2 +-
 gr-qtgui/grc/qtgui_vector_sink_f.xml         |    2 +-
 gr-qtgui/grc/qtgui_waterfall_sink_x.xml      |    2 +-
 gr-qtgui/include/QtWidgets/QRegExpValidator  |    9 +
 gr-qtgui/include/gnuradio/qtgui/form_menus.h |    1 +
 gr-qtgui/lib/CMakeLists.txt                  |    8 +-
 gr-qtgui/lib/SpectrumGUIClass.cc             |    1 -
 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/range.py               |   26 +-
 grc/blocks/options.xml                       |    2 +-
 grc/python/flow_graph.tmpl                   |    8 +-
 53 files changed, 2219 insertions(+), 1154 deletions(-)