diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-04-22 23:18:24 (GMT) |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-04-22 23:18:24 (GMT) |
commit | 5d695c4442107fb5a3fbd37acdaa1f5d1d3ca06f (patch) | |
tree | 6d6720837e14be7e65da4d8a08d44e6fea5a55cc /src/plugins/gfxdrivers/directfb/qdirectfbscreen.h | |
parent | 7fa8e95d1b87403aab14dd326520600bc028a195 (diff) | |
parent | d64d13102d3d53d0aa43597408d7abf3fecb57a3 (diff) | |
download | Qt-5d695c4442107fb5a3fbd37acdaa1f5d1d3ca06f.zip Qt-5d695c4442107fb5a3fbd37acdaa1f5d1d3ca06f.tar.gz Qt-5d695c4442107fb5a3fbd37acdaa1f5d1d3ca06f.tar.bz2 |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/plugins/gfxdrivers/directfb/qdirectfbscreen.h')
-rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbscreen.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h index f394ac1..8dd38dc 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h @@ -127,6 +127,8 @@ public: const QImage &image); #endif + static uchar *lockSurface(IDirectFBSurface *surface, DFBSurfaceLockFlags flags, int *bpl = 0); + private: void compose(const QRegion &r); void blit(IDirectFBSurface *src, const QPoint &topLeft, |