diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-11-17 12:56:03 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-11-17 12:56:03 (GMT) |
| commit | a34730e837bc1430011028dba11bbf5a4672789d (patch) | |
| tree | e3a255dc51cada6c680d9110b855f46ba99804bd /tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp | |
| parent | b5d26bfb348b6a99529ecf9ab66845e7eacd4732 (diff) | |
| parent | 88c2e6f8f9f968c6bfe4ca0c0e3e54365a3e0c82 (diff) | |
| download | Qt-a34730e837bc1430011028dba11bbf5a4672789d.zip Qt-a34730e837bc1430011028dba11bbf5a4672789d.tar.gz Qt-a34730e837bc1430011028dba11bbf5a4672789d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp')
| -rw-r--r-- | tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp b/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp index d43efe2..9700581f 100644 --- a/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp +++ b/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp @@ -41,6 +41,7 @@ #include "qmeegolivepixmap.h" #include "qmeegolivepixmap_p.h" +#include "qmeegofencesync_p.h" #include "qmeegoruntime.h" /* QMeeGoLivePixmapPrivate */ @@ -102,10 +103,12 @@ QMeeGoLivePixmap::~QMeeGoLivePixmap() { } -QImage* QMeeGoLivePixmap::lock() +QImage* QMeeGoLivePixmap::lock(QMeeGoFenceSync *fenceSync) { - return QMeeGoRuntime::lockLiveTexture(this); - + if (fenceSync) + return QMeeGoRuntime::lockLiveTexture(this, fenceSync->d_func()->syncObject); + else + return QMeeGoRuntime::lockLiveTexture(this, NULL); } void QMeeGoLivePixmap::release(QImage *img) |