summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau2011-10-17 22:52:18 -0700
committerTom Rondeau2011-10-17 22:52:18 -0700
commita01c42495ecd9f3a8b34c3e10cfd0e9fec1f26c4 (patch)
tree431189657cad906e22a25cf1aef653ec900b2b90
parenta69e35b2d9b5a07c86603a39b16111565258b41a (diff)
parent6a274e19aac8b0b3066af5b6990f563ec3170221 (diff)
downloadgnuradio-a01c42495ecd9f3a8b34c3e10cfd0e9fec1f26c4.tar.gz
gnuradio-a01c42495ecd9f3a8b34c3e10cfd0e9fec1f26c4.tar.bz2
gnuradio-a01c42495ecd9f3a8b34c3e10cfd0e9fec1f26c4.zip
Merge branch 'maint'
-rw-r--r--gr-qtgui/lib/plot_waterfall.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/gr-qtgui/lib/plot_waterfall.h b/gr-qtgui/lib/plot_waterfall.h
index d4cb8d6da..1613dd8de 100644
--- a/gr-qtgui/lib/plot_waterfall.h
+++ b/gr-qtgui/lib/plot_waterfall.h
@@ -37,9 +37,8 @@ public:
#if QWT_VERSION < 0x060000
virtual QwtDoubleRect boundingRect() const;
-#endif
-
virtual QSize rasterHint(const QwtDoubleRect &) const;
+#endif
virtual int rtti() const;