[Commit-gnuradio] [gnuradio] 01/01: Merge branch '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 78776327a5d368c120344b4ef6a96ea997c61119
Merge: 90737bc 595693c
Author: Johnathan Corgan <address@hidden>
Date:   Tue Apr 26 15:05:55 2016 -0700

    Merge branch 'next' into next-qt5

 gr-qtgui/doc/qtgui.dox                         |  48 ++
 gr-qtgui/examples/CMakeLists.txt               |   1 +
 gr-qtgui/examples/test_qtgui_msg.grc           | 978 +++++++++++++++++++++++++
 gr-qtgui/grc/qtgui_block_tree.xml              |   1 +
 gr-qtgui/grc/qtgui_edit_box_msg.xml            | 152 ++++
 gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt |   1 +
 gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h | 151 ++++
 gr-qtgui/include/gnuradio/qtgui/qtgui_types.h  |  20 +-
 gr-qtgui/lib/CMakeLists.txt                    |   2 +
 gr-qtgui/lib/edit_box_msg_impl.cc              | 571 +++++++++++++++
 gr-qtgui/lib/edit_box_msg_impl.h               |  93 +++
 gr-qtgui/swig/qtgui_swig.i                     |  15 +
 12 files changed, 2032 insertions(+), 1 deletion(-)

diff --cc gr-qtgui/lib/CMakeLists.txt
index 24f3458,276c3e4..92a2456
--- a/gr-qtgui/lib/CMakeLists.txt
+++ b/gr-qtgui/lib/CMakeLists.txt
@@@ -43,9 -43,10 +43,10 @@@ set(qtgui_moc_hdr
      ${qtgui_mod_includedir}/ConstellationDisplayPlot.h
      ${qtgui_mod_includedir}/HistogramDisplayPlot.h
      ${qtgui_mod_includedir}/VectorDisplayPlot.h
+     edit_box_msg_impl.h
  )
 -QT4_WRAP_CPP(qtgui_moc_sources ${qtgui_moc_hdrs})
 -QT4_WRAP_UI(qtgui_ui_hdrs spectrumdisplayform.ui)
 +QT5_WRAP_CPP(qtgui_moc_sources ${qtgui_moc_hdrs})
 +QT5_WRAP_UI(qtgui_ui_hdrs spectrumdisplayform.ui)
  
  #FIXME the sources expect <foo>.ui.h, but the macros generate ui_foo.h
  #avoid changing the sources by generating the header with the include