3 files changed, 8 insertions, 4 deletions
diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc
index 7abd9aeef..94a8e6210 100644
--- a/gr-qtgui/lib/WaterfallDisplayPlot.cc
+++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc
@@ -318,7 +318,7 @@ WaterfallDisplayPlot::WaterfallDisplayPlot(QWidget* parent)
 
 #else
   d_spectrogram = new QwtPlotSpectrogram("Spectrogram");
-  d_spectrogram->setData(*d_data);
+  d_spectrogram->setData(d_data);
   d_spectrogram->setDisplayMode(QwtPlotSpectrogram::ImageMode, true);
   d_spectrogram->setColorMap(new ColorMap_MultiColor());
 #endif
diff --git a/gr-qtgui/lib/plot_waterfall.cc b/gr-qtgui/lib/plot_waterfall.cc
index 527eea22e..dbba657b8 100644
--- a/gr-qtgui/lib/plot_waterfall.cc
+++ b/gr-qtgui/lib/plot_waterfall.cc
@@ -180,12 +180,17 @@ QImage PlotWaterfall::renderImage(const QwtScaleMap &xMap,
     if ( area.isEmpty() )
         return QImage();
 
+#if QWT_VERSION < 0x060000
     QRect rect = transform(xMap, yMap, area);
+    const QSize res = d_data->data->rasterHint(area);
+#else
+    QRect rect(0,0,0,0);
+    const QSize res(0,0);
+#endif
 
     QwtScaleMap xxMap = xMap;
     QwtScaleMap yyMap = yMap;
 
-    const QSize res = d_data->data->rasterHint(area);
     if ( res.isValid() )
     {
         /*
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;