diff --git a/qwt/examples/animation/main.cpp b/qwt/examples/animation/main.cpp
index 5e8949f0c..f5a4a9b9a 100644
--- a/qwt/examples/animation/main.cpp
+++ b/qwt/examples/animation/main.cpp
@@ -2,7 +2,7 @@
 #include "plot.h"
 
 #ifndef QWT_NO_OPENGL
-#define USE_OPENGL 0
+#define USE_OPENGL 1
 #endif
 
 #if USE_OPENGL
diff --git a/qwt/examples/refreshtest/main.cpp b/qwt/examples/refreshtest/main.cpp
index de5a16669..0a306848e 100644
--- a/qwt/examples/refreshtest/main.cpp
+++ b/qwt/examples/refreshtest/main.cpp
@@ -3,7 +3,7 @@
 
 #ifndef QWT_NO_OPENGL
 #if QT_VERSION >= 0x040600 && QT_VERSION < 0x050000
-#define USE_OPENGL 0
+#define USE_OPENGL 1
 #endif
 #endif
 
diff --git a/qwt/examples/refreshtest/plot.cpp b/qwt/examples/refreshtest/plot.cpp
index c9ff7be42..8db9348c2 100644
--- a/qwt/examples/refreshtest/plot.cpp
+++ b/qwt/examples/refreshtest/plot.cpp
@@ -1,5 +1,3 @@
-#define QWT_NO_OPENGL
-
 #include <qglobal.h>
 #include <qwt_painter.h>
 #include <qwt_plot_canvas.h>
diff --git a/qwt/qwtconfig.pri b/qwt/qwtconfig.pri
index 79b2bcd29..ba41371b9 100644
--- a/qwt/qwtconfig.pri
+++ b/qwt/qwtconfig.pri
@@ -70,7 +70,7 @@ QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
 # it will be a static library.
 ######################################################################
 
-#QWT_CONFIG           += QwtDll
+QWT_CONFIG           += QwtDll
 
 ######################################################################
 # QwtPlot enables all classes, that are needed to use the QwtPlot 
diff --git a/qwt/src/qwt_plot.cpp b/qwt/src/qwt_plot.cpp
index 6ab2ae2a8..eb4c7e6b4 100644
--- a/qwt/src/qwt_plot.cpp
+++ b/qwt/src/qwt_plot.cpp
@@ -110,7 +110,7 @@ class QwtPlot::PrivateData
 public:
     QPointer<QwtTextLabel> titleLabel;
     QPointer<QwtTextLabel> footerLabel;
-    QPointer<QwtPlotCanvas> canvas;
+    QPointer<QWidget> canvas;
     QPointer<QwtAbstractLegend> legend;
     QwtPlotLayout *layout;
 
@@ -241,7 +241,7 @@ void QwtPlot::initPlot( const QwtText &title )
   \param canvas Canvas Widget
   \sa canvas()
  */
-void QwtPlot::setCanvas( QwtPlotCanvas *canvas )
+void QwtPlot::setCanvas( QWidget *canvas )
 {
     if ( canvas == d_data->canvas )
         return;
@@ -491,7 +491,7 @@ const QwtAbstractLegend *QwtPlot::legend() const
 /*!
   \return the plot's canvas
 */
-QwtPlotCanvas *QwtPlot::canvas()
+QWidget *QwtPlot::canvas()
 {
     return d_data->canvas;
 }
@@ -499,7 +499,7 @@ QwtPlotCanvas *QwtPlot::canvas()
 /*!
   \return the plot's canvas
 */
-const QwtPlotCanvas *QwtPlot::canvas() const
+const QWidget *QwtPlot::canvas() const
 {
     return d_data->canvas;
 }
diff --git a/qwt/src/qwt_plot.h b/qwt/src/qwt_plot.h
index 1ebc07c0b..b8ff76788 100644
--- a/qwt/src/qwt_plot.h
+++ b/qwt/src/qwt_plot.h
@@ -14,7 +14,6 @@
 #include "qwt_axis_id.h"
 #include "qwt_text.h"
 #include "qwt_plot_dict.h"
-#include "qwt_plot_canvas.h"
 #include "qwt_scale_map.h"
 #include "qwt_interval.h"
 #include <qframe.h>
@@ -153,10 +152,10 @@ public:
 
     // Canvas
 
-    void setCanvas( QwtPlotCanvas * );
+    void setCanvas( QWidget * );
 
-    QwtPlotCanvas *canvas();
-    const QwtPlotCanvas *canvas() const;
+    QWidget *canvas();
+    const QWidget *canvas() const;
 
     void setCanvasBackground( const QBrush & );
     QBrush canvasBackground() const;