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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  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
  Revert "Fix memory leaks in OpenVG and OpenGL resource pools"
  Fix window surface config on OpenGL graphics system.
  Symbian: Fix a case sensitivity issue with QMAKE_EXTRA_COMPILERS
  Symbian: Fix double deletion of selected text when using predictive
  tests: fixed compile of qscriptextensionplugin test with high -jN
  Symbian: improving diagnostics for QWaitCondition
  Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18
  Symbian: Fix language mappings for localize_deployment
  Symbian: Only localize the application .rss that needs it, not all .rss
  Revert "Fix sqlite driver memory eating due to close failure"
  Revert "Fix sqlite driver memory eating due to close failure"
  tests: make tests compile or disable those which don't compile
  Reduce unnecessary QtCore DLL loads during Symbian app thread creation
  Fix HarfBuzz Thai character SARA AM handling

1 files changed, 43 insertions, 1 deletions

diff --git a/src/plugins/platforms/directfb/qdirectfbconvenience.h b/src/plugins/platforms/directfb/qdirectfbconvenience.h
index c82bea8..d009393 100644
--- a/src/plugins/platforms/directfb/qdirectfbconvenience.h
+++ b/src/plugins/platforms/directfb/qdirectfbconvenience.h
@@ -49,6 +49,11 @@
 
 #include <directfb.h>
 
+QT_BEGIN_NAMESPACE
+
+class QDirectFbScreen;
+class QPlatformScreen;
+
 class QDirectFbKeyMap: public QHash<DFBInputDeviceKeySymbol, Qt::Key>
 {
 public:
@@ -67,7 +72,7 @@ public:
     static IDirectFB *dfbInterface();
     static IDirectFBDisplayLayer *dfbDisplayLayer(int display = DLID_PRIMARY);
 
-    static IDirectFBSurface *dfbSurfaceForPixmapData(QPixmapData *);
+    static IDirectFBSurface *dfbSurfaceForPlatformPixmap(QPixmapData *);
 
     static Qt::MouseButton mouseButton(DFBInputDeviceButtonIdentifier identifier);
     static Qt::MouseButtons mouseButtons(DFBInputDeviceButtonMask mask);
@@ -81,4 +86,41 @@ private:
     friend class QDirectFbIntegration;
 };
 
+template <typename T> struct QDirectFBInterfaceCleanupHandler
+{
+    static void cleanup(T *t)
+    {
+        if (!t)
+            return;
+        t->Release(t);
+    }
+};
+
+template <typename T>
+class QDirectFBPointer : public QScopedPointer<T, QDirectFBInterfaceCleanupHandler<T> >
+{
+public:
+    QDirectFBPointer(T *t = 0)
+        : QScopedPointer<T, QDirectFBInterfaceCleanupHandler<T> >(t)
+    {}
+
+    T** outPtr()
+    {
+        this->reset(0);
+        return &this->d;
+    }
+};
+
+// Helper conversions from internal to DFB types
+QDirectFbScreen *toDfbScreen(QWidget *window);
+IDirectFBDisplayLayer *toDfbLayer(QPlatformScreen *screen);
+
+#define QDFB_STRINGIFY(x) #x
+#define QDFB_TOSTRING(x) QDFB_STRINGIFY(x)
+#define QDFB_PRETTY \
+    (__FILE__ ":" QDFB_TOSTRING(__LINE__))
+
+QT_END_NAMESPACE
+
+
 #endif // QDIRECTFBCONVENIENCE_H