[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] branch next updated (68eb2af -> a7a5779)
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] branch next updated (68eb2af -> a7a5779) |
Date: |
Thu, 25 Aug 2016 00:32:21 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a change to branch next
in repository gnuradio.
from 68eb2af Merge remote-tracking branch 'mmueller/fix_GLFSR' into
next
new e27af38 dark.qss: cause forced-on data lines to die in a fire
new f14e631 Merge branch 'maint'
new 9404180 Merge branch 'master' into next
adds 63f3207 CMake: Update required minimum version to 2.8.12
adds 1a56aad CMake: FindQwt: Find the Qt5 version of QWT instead of
the Qt4 version
adds 21cc755 gr-qtgui: update for Qt5
adds a0ac551 grc: Generate Python scripts that use PyQt5
adds 585e7fb CMake: Remove obsolete GrSetupQt4 module
adds 1c2c2b8 gr-qtgui: Add a workaround for an upstream bug of 'uic'
adds 7bc999f qtgui: fixed examples for Qt5 compatibility.
adds 480420d Merge remote-tracking branch 'tom/qt5_next' into next-qt5
adds 0b0eddb Merge branch 'next' into next-qt5
adds a342646 Merge branch 'next' into next-qt5
adds 85fdc19 Merge branch 'next' into next-qt5
adds 6903755 Merge branch 'next' into next-qt5
adds fc92ccf Merge branch 'next' into next-qt5
adds 2f16f12 Merge branch 'next' into next-qt5
adds fd79378 Merge branch 'next' into next-qt5
adds 7b896ac Merge branch 'next' into next-qt5
adds 9561b17 Merge branch 'next' into next-qt5
adds d0b9dcf Merge branch 'next' into next-qt5
adds a6d80b8 Merge branch 'next' into next-qt5
adds 372390b Merge branch 'next' into next-qt5
adds 11f04bb Merge branch 'next' into next-qt5
adds c4de361 Merge branch 'next' into next-qt5
adds fb06459 Merge branch 'next' into next-qt5
adds 76c57a7 Merge branch 'next' into next-qt5
adds 3a26afd Merge branch 'next' into next-qt5
adds 57a7e8d Merge branch 'next' into next-qt5
adds a6c4730 Merge branch 'next' into next-qt5
adds 3b54fdb Merge branch 'next' into next-qt5
adds 2a305ae Merge branch 'next' into next-qt5
adds 8da3a47 Merge branch 'next' into next-qt5
adds b53e5d4 Merge branch 'next' into next-qt5
adds 2ddbd14 Merge branch 'next' into next-qt5
adds 099eb72 Merge branch 'next' into next-qt5
adds d8353e1 Merge branch 'next' into next-qt5
adds 55112c5 Merge branch 'next' into next-qt5
adds 8a12db0 Merge branch 'next' into next-qt5
adds a7c7a35 Merge branch 'next' into next-qt5
adds e5d5794 Merge branch 'next' into next-qt5
adds ad3dca7 Merge branch 'next' into next-qt5
adds cdef0e8 Merge branch 'next' into next-qt5
adds b4b63bd Merge branch 'next' into next-qt5
adds 358d303 Merge branch 'next' into next-qt5
adds 7b75982 Merge branch 'next' into next-qt5
adds 252b207 Merge branch 'next' into next-qt5
adds a3f1ecf Merge branch 'next' into next-qt5
adds 33be3af Merge branch 'next' into next-qt5
adds 28363e9 Merge branch 'next' into next-qt5
adds c325592 Merge branch 'next' into next-qt5
adds 86aac66 Merge branch 'next' into next-qt5
adds 4e086ec Merge branch 'next' into next-qt5
adds e977fe8 Merge branch 'next' into next-qt5
adds 3230790 Merge branch 'next' into next-qt5
adds f4dd708 Merge branch 'next' into next-qt5
adds 3e494c4 Merge branch 'next' into next-qt5
adds 90737bc Merge branch 'next' into next-qt5
adds 7877632 Merge branch 'next' into next-qt5
adds c007d8b Merge branch 'next' into next-qt5
adds 49e085a Merge branch 'next' into next-qt5
adds 100abdf Merge branch 'next' into next-qt5
adds ff85dcb qtgui: Fixes for edit_box_msg to work with QT5.
adds 2faf325 Merge branch 'next' into next-qt5
adds 7b44e29 Merge branch 'next' into next-qt5
adds 1b3e191 Merge branch 'next' into next-qt5
adds d7be06c Merge branch 'next' into next-qt5
adds 76ef9a3 Merge branch 'next' into next-qt5
adds 313990f Merge branch 'next' into next-qt5
adds 11ce262 Merge branch 'next' into next-qt5
adds c034036 Merge branch 'next' into 'next-qt5'
adds f1903e8 Merge branch 'next' into next-qt5
adds b6e8bdd Merge branch 'next' into next-qt5
adds 87736f4 Merge branch 'next' into next-qt5
adds a0ecf33 Merge branch 'next' into next-qt5
adds 605ecd5 Merge branch 'next' into next-qt5
adds 3c14957 Merge branch 'next' into next-qt5
adds 70780d6 Revert "CMake: Remove obsolete GrSetupQt4 module"
adds 22778fb gr-qtgui: Allow build with Qt4 or Qt5 (default)
adds 9eae37c cmake: FindQwt: Find the Qwt library that matches the Qt
version
adds c76a7e0 gr-qtgui: Fix PyQt[4,5] include in XMLs for GRC
adds fef76c2 gr-qtgui: Fix range.py to work with both Qt4 and Qt5
adds 00939e9 gr-qtgui: Re-introduce some Qt4-specific code
adds 0bf66e0 grc: Fix generation of Python code for Qt4 and Qt5
adds a63f6c6 qtgui: tolerate return of NoneType when setting not found
adds cc57ff6 Merge branch 'adi-qt5' into next-qt5
adds b700817 Merge branch 'next' into next-qt5
adds dc760df Merge branch 'next' into next-qt5
adds 0d324dc Merge branch 'next' into next-qt5
adds 3dd3aa3 Merge branch 'next' into next-qt5
adds 5bbb2fd Merge branch 'next' into next-qt5
adds a4a4c5a Merge branch 'next' into next-qt5
adds 6f454d8 Merge branch 'next' into next-qt5
adds c0afa32 Merge branch 'next' into next-qt5
adds 67fbbe0 Merge branch 'next' into next-qt5
adds 4c961d0 Merge branch 'next' into next-qt5
adds 5dc4b7b Merge branch 'next' into next-qt5
adds bc86203 Merge branch 'next' into next-qt5
adds de5f726 Merge branch 'next' into next-qt5
adds ae05e46 Merge branch 'next' into next-qt5
adds 826b794 Merge branch 'next' into next-qt5
adds e09246a Merge branch 'next' into next-qt5
adds d6b4e78 Merge branch 'next' into next-qt5
adds 82b92f9 Merge branch 'next' into next-qt5
adds b15d2d3 Merge branch 'next' into next-qt5 with default strategy
adds a0ff8dc Merge branch 'next' into next-qt5
adds 22e3ee0 Merge branch 'next' into next-qt5
new a7a5779 Merge branch 'next-qt5' into next
The 4 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 | 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 +-
gr-qtgui/themes/dark.qss | 1 -
grc/blocks/CMakeLists.txt | 4 +-
grc/blocks/{options.xml => options.xml.cmakein} | 2 +-
grc/core/generator/flow_graph.tmpl | 18 +-
61 files changed, 2304 insertions(+), 977 deletions(-)
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%)
create mode 100644 gr-qtgui/include/QtWidgets/QRegExpValidator
rename gr-qtgui/python/qtgui/{range.py => range.py.cmakein} (93%)
rename grc/blocks/{options.xml => options.xml.cmakein} (99%)
- [Commit-gnuradio] [gnuradio] branch next updated (68eb2af -> a7a5779),
git <=