diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-10 12:56:11 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-10 12:56:11 (GMT) |
| commit | 19e19142d8a56ba880dca869c5721ea8f72fea16 (patch) | |
| tree | ba18b0ac8ec954bc905af5a9adb1be00b6da1bbc /src/gui/image/qpixmapdata_p.h | |
| parent | 95fcfccf3c6d9d102fa1c5481e6be52a21749af6 (diff) | |
| parent | 7101ae5a0e90d97acf86a444c4d51ca45e7863fe (diff) | |
| download | Qt-19e19142d8a56ba880dca869c5721ea8f72fea16.zip Qt-19e19142d8a56ba880dca869c5721ea8f72fea16.tar.gz Qt-19e19142d8a56ba880dca869c5721ea8f72fea16.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/image/qpixmapdata_p.h')
| -rw-r--r-- | src/gui/image/qpixmapdata_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h index 827fa18..60ed26a 100644 --- a/src/gui/image/qpixmapdata_p.h +++ b/src/gui/image/qpixmapdata_p.h @@ -73,7 +73,7 @@ public: }; #endif enum ClassId { RasterClass, X11Class, MacClass, DirectFBClass, - OpenGLClass, OpenVGClass, CustomClass = 1024 }; + OpenGLClass, OpenVGClass, RuntimeClass, CustomClass = 1024 }; QPixmapData(PixelType pixelType, int classId); virtual ~QPixmapData(); @@ -133,7 +133,10 @@ public: static QPixmapData *create(int w, int h, PixelType type); + virtual QPixmapData *runtimeData() const { return 0; } + protected: + void setSerialNumber(int serNo); int w; int h; |