diff options
| author | Johnathan Corgan | 2010-10-06 12:52:44 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-10-06 12:52:44 -0700 |
| commit | 1c936ad101cbd7edf8e6b96bf3f993163a7dcc7b (patch) | |
| tree | d118e6dd1ab5c59fcf0257d256843a047ad55e39 /gr-qtgui/src/lib/.gitignore | |
| parent | 9ccd86714958fb2bd0cdc457745737f6d20efd7f (diff) | |
| parent | 125433fe84507cc84e585c1e06bb804fdb2ce043 (diff) | |
| download | gnuradio-1c936ad101cbd7edf8e6b96bf3f993163a7dcc7b.tar.gz gnuradio-1c936ad101cbd7edf8e6b96bf3f993163a7dcc7b.tar.bz2 gnuradio-1c936ad101cbd7edf8e6b96bf3f993163a7dcc7b.zip | |
Merge branch 'master' into next
* master:
Fixed setting of USB_LIBS for *win*
Fix so that non-Darwin OSs use USB_LIBS correctly for linking
New way of checking for various LIBUSB names; for legacy version, make sure the symbol 'usb_debug' exists (so-as to not use the 'compat' version).
Finally, the simple fix for the qtgui issues; also, changed the naming scheme output from _moc to .moc files because I think this looks cleaner.
Removing Waterfall3DPlot. The qwt_plot3d is too much of a hassle to deal with and the plotting is not that stable even when it does work. This does not change the API.
Fixed gitignore to reflect changes in moc/ui file naming.
Fixes a lot of warnings by cleaning up namespace issues.
Finally, the simple fix for the qtgui issues; also, changed the naming scheme output from _moc to .moc files because I think this looks cleaner.
Removing qwtplot3d dependency and fixing a missed include in waterfallGlobalData.h.
Removing Waterfall3DPlot. The qwt_plot3d is too much of a hassle to deal with and the plotting is not that stable even when it does work. This does not change the API.
Updating all of the QA code that I can actually test to work with the new XML output runners.
Updating all python QA programs in gnuradio-core to output XML files.
Adding gr_xmlrunner.py to Makefile.
Adding XML output to Python unittests.
Modified gcell and gr-atsc cppunit tests to output XML files, too. Gcell needs testing.
Moving XML output files from cppunit tests to $HOME/.gnuradio/unittests.
Adding an XML outputter for the CPP Unit tests. This is to a) store the output information but also b) for integration with Hudson for logging and displaying the results during the build stages. This only covers a few cases so far and I need to define a better place to save the output files.
Diffstat (limited to 'gr-qtgui/src/lib/.gitignore')
| -rw-r--r-- | gr-qtgui/src/lib/.gitignore | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gr-qtgui/src/lib/.gitignore b/gr-qtgui/src/lib/.gitignore index 58c8081e5..11bb4342a 100644 --- a/gr-qtgui/src/lib/.gitignore +++ b/gr-qtgui/src/lib/.gitignore @@ -4,10 +4,10 @@ /.deps /qtgui.cc /qtgui.py -/WaterfallDisplayPlot_moc.cc -/Waterfall3DDisplayPlot_moc.cc -/TimeDomainDisplayPlot_moc.cc -/spectrumdisplayform_moc.cc -/spectrumdisplayform_ui.h -/FrequencyDisplayPlot_moc.cc -/ConstellationDisplayPlot_moc.cc +/WaterfallDisplayPlot.moc.cc +/Waterfall3DDisplayPlot.moc.cc +/TimeDomainDisplayPlot.moc.cc +/spectrumdisplayform.moc.cc +/spectrumdisplayform.ui.h +/FrequencyDisplayPlot.moc.cc +/ConstellationDisplayPlot.moc.cc |