diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-22 09:58:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-22 09:58:08 (GMT) |
| commit | 98824c2ebe97f61bf294b0be07ac164aed470fbf (patch) | |
| tree | 0621c3002e2f2fe28fc6e39a14429928cc2aa072 /tools/qmeegographicssystemhelper/qmeegolivepixmap.h | |
| parent | a3c2f84f1a33610b86a600c68653b96de1d2b9f5 (diff) | |
| parent | e5be06e53a33605a4f5987e9d451b2143470bdf4 (diff) | |
| download | Qt-98824c2ebe97f61bf294b0be07ac164aed470fbf.zip Qt-98824c2ebe97f61bf294b0be07ac164aed470fbf.tar.gz Qt-98824c2ebe97f61bf294b0be07ac164aed470fbf.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fall back to Qt for loading images with DICAPS_COLORKEY.
Implement QWidget::metric PdmNumColors for QWS
Adding ::scroll capabilities to live pixmaps.
Major refactoring: creating a new QPixmapData subclass for live textures.
Diffstat (limited to 'tools/qmeegographicssystemhelper/qmeegolivepixmap.h')
| -rw-r--r-- | tools/qmeegographicssystemhelper/qmeegolivepixmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmeegographicssystemhelper/qmeegolivepixmap.h b/tools/qmeegographicssystemhelper/qmeegolivepixmap.h index 12fe994..7be2c4b 100644 --- a/tools/qmeegographicssystemhelper/qmeegolivepixmap.h +++ b/tools/qmeegographicssystemhelper/qmeegolivepixmap.h @@ -52,7 +52,7 @@ class QImage; /*! */ -class QMeeGoLivePixmap : public QPixmap +class Q_DECL_EXPORT QMeeGoLivePixmap : public QPixmap { public: enum Format { @@ -96,7 +96,7 @@ public: virtual ~QMeeGoLivePixmap(); private: - QMeeGoLivePixmap(QPixmapData *p, Qt::HANDLE h); + QMeeGoLivePixmap(QPixmapData *p); Q_DISABLE_COPY(QMeeGoLivePixmap) Q_DECLARE_PRIVATE(QMeeGoLivePixmap) |