diff options
| author | Tom Rondeau | 2011-10-17 22:52:28 -0700 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-17 22:52:28 -0700 |
| commit | f664585ddddeb040d1cd285d0b9dfb41c4979b91 (patch) | |
| tree | cf898137306f6bfe4e67314b66b6b57cc88caad8 /gr-qtgui | |
| parent | 1c7bd647877ca835a410df903c478c99ead92b27 (diff) | |
| parent | a01c42495ecd9f3a8b34c3e10cfd0e9fec1f26c4 (diff) | |
| download | gnuradio-f664585ddddeb040d1cd285d0b9dfb41c4979b91.tar.gz gnuradio-f664585ddddeb040d1cd285d0b9dfb41c4979b91.tar.bz2 gnuradio-f664585ddddeb040d1cd285d0b9dfb41c4979b91.zip | |
Merge branch 'master' into next
Diffstat (limited to 'gr-qtgui')
| -rw-r--r-- | gr-qtgui/lib/plot_waterfall.h | 3 |
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; |