diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-08 21:41:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-08 21:41:58 (GMT) |
| commit | 5ddf54654044df30bf4febada6cbdc46fcdbde62 (patch) | |
| tree | 6fa945056c0deb3d5d303e8f5c4e996d66a9608a /src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h | |
| parent | 3fde625831df6970ff2ad1e58b374541d46dfa97 (diff) | |
| parent | 1e9b107b082282d4aadcffedcd67cb7e5e56aef8 (diff) | |
| download | Qt-5ddf54654044df30bf4febada6cbdc46fcdbde62.zip Qt-5ddf54654044df30bf4febada6cbdc46fcdbde62.tar.gz Qt-5ddf54654044df30bf4febada6cbdc46fcdbde62.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Invalidate the EGL surface of QMeeGoLivePixmapData when switching to Raster
PinchArea example produced incorrect scaling.
Added image conversion flag to prevent conversions.
Fix TextInput auto test failure on mac.
Fix word selection locking on string boundaries.
Fix potential crash in QTextControl.
QDeclarativePropertyMap::keys() cannot be called from qml
Compensate for horizontal scroll in TextInput micro focus.
Diffstat (limited to 'src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h')
| -rw-r--r-- | src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h index 484028e..616b33c 100644 --- a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h +++ b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h @@ -42,9 +42,13 @@ #ifndef MLIVEPIXMAPDATA_H #define MLIVEPIXMAPDATA_H +#include <QLinkedList> #include <private/qpixmapdata_gl_p.h> #include "qmeegoextensions.h" +class QMeeGoLivePixmapData; +typedef QLinkedList<QMeeGoLivePixmapData *> QMeeGoLivePixmapDataList; + class QMeeGoLivePixmapData : public QGLPixmapData { public: @@ -66,6 +70,9 @@ public: QPixmap *backingX11Pixmap; QImage lockedImage; + QMeeGoLivePixmapDataList::Iterator pos; + + static void invalidateSurfaces(); }; #endif |