Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Default to QDir::homePath() in Symbian native file dialogs
  directfb: Backport the work from QtBase to Qt 4.8
  [blitter] Work on tst_QPixmap::clear()
  [blitter] Use QScopedPointer for the engine and blittable
  [blitter] Generate a new serial number when resizing the
  [blitter] Fix memory leak in the blitter paintengine
  Fix NTLM authentication with email address
  Fix null pointer dereference in NTLM authentication

1 files changed, 5 insertions, 6 deletions

diff --git a/src/plugins/platforms/directfb/qdirectfbwindowsurface.h b/src/plugins/platforms/directfb/qdirectfbwindowsurface.h
index 7f1140d..dd0354d 100644
--- a/src/plugins/platforms/directfb/qdirectfbwindowsurface.h
+++ b/src/plugins/platforms/directfb/qdirectfbwindowsurface.h
@@ -44,16 +44,16 @@
 
 #include <QtGui/private/qwindowsurface_p.h>
 #include <private/qpixmap_blitter_p.h>
-
 #include <directfb.h>
 
+#include "qdirectfbconvenience.h"
+
 QT_BEGIN_NAMESPACE
 
 class QDirectFbWindowSurface : public QWindowSurface
 {
 public:
-    QDirectFbWindowSurface(QWidget *window, WId wid);
-    ~QDirectFbWindowSurface();
+    QDirectFbWindowSurface(QWidget *window);
 
     QPaintDevice *paintDevice();
     void flush(QWidget *widget, const QRegion &region, const QPoint &offset);
@@ -66,10 +66,9 @@ public:
 private:
     void lockSurfaceToImage();
 
-    QPixmap *m_pixmap;
+    QScopedPointer<QPixmap> m_pixmap;
     QBlittablePixmapData *m_pmdata;
-
-    IDirectFBSurface *m_dfbSurface;
+    QDirectFBPointer<IDirectFBSurface> m_dfbSurface;
 };
 
 QT_END_NAMESPACE