diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-09 15:33:38 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-09 15:33:38 (GMT) |
| commit | b4ddf0420db30098274986612ca3e8951ef18e2e (patch) | |
| tree | a85bdad9b92652b09dd613b2172d5b07d4926d4b /tools/qmeegographicssystemhelper/qmeegolivepixmap_p.h | |
| parent | 612a7680e10eb434cd6e09a2165ab1b75efdb72a (diff) | |
| parent | e1fead7c4f877308c2cc11131c445a1f7085baf7 (diff) | |
| download | Qt-b4ddf0420db30098274986612ca3e8951ef18e2e.zip Qt-b4ddf0420db30098274986612ca3e8951ef18e2e.tar.gz Qt-b4ddf0420db30098274986612ca3e8951ef18e2e.tar.bz2 | |
Merge branch '4.7' into mimir
Diffstat (limited to 'tools/qmeegographicssystemhelper/qmeegolivepixmap_p.h')
| -rw-r--r-- | tools/qmeegographicssystemhelper/qmeegolivepixmap_p.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tools/qmeegographicssystemhelper/qmeegolivepixmap_p.h b/tools/qmeegographicssystemhelper/qmeegolivepixmap_p.h index c2591dc..22347d6 100644 --- a/tools/qmeegographicssystemhelper/qmeegolivepixmap_p.h +++ b/tools/qmeegographicssystemhelper/qmeegolivepixmap_p.h @@ -48,19 +48,12 @@ class QMeeGoLivePixmapPrivate { public: Q_DECLARE_PUBLIC(QMeeGoLivePixmap); - QMeeGoLivePixmapPrivate(); - void copyBackFrom(const void *raw); + QMeeGoLivePixmapPrivate(Qt::HANDLE handle); virtual ~QMeeGoLivePixmapPrivate(); - QSharedMemory *shm; - int shmSerial; - bool owns; - QMeeGoLiveImage *parentImage; + Qt::HANDLE handle; QMeeGoLivePixmap *q_ptr; - - friend class QMeeGoLiveImage; - friend class QMeeGoLiveImagePrivate; }; #endif |