From: Johnathan Corgan Date: Wed, 6 Oct 2010 19:20:08 +0000 (-0700) Subject: Merge remote branch 'tom/qtfix' into maint X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=2723c3fb2a22872bba1c72bab1d0c4e74ffda86f;p=debian%2Fgnuradio Merge remote branch 'tom/qtfix' into maint * tom/qtfix: 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. --- 2723c3fb2a22872bba1c72bab1d0c4e74ffda86f