diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-07 20:23:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-07 20:23:17 (GMT) |
| commit | e41274fede7f35324e37438bd8c08fd78e0ca29f (patch) | |
| tree | 1aed3d8bc9c38e3f720bab8d6874d2cb444534b3 /src/gui | |
| parent | 77fb7ffa69fe0183e8547fca69fc976364d05408 (diff) | |
| parent | 12d8ce6f03db8a577271ac042cd310a25dde0c21 (diff) | |
| download | Qt-e41274fede7f35324e37438bd8c08fd78e0ca29f.zip Qt-e41274fede7f35324e37438bd8c08fd78e0ca29f.tar.gz Qt-e41274fede7f35324e37438bd8c08fd78e0ca29f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Remove unnecessary function declarations from qpixmap_s60_p.h
Fix text size issues for high ppi displays
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qpixmap_s60_p.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/image/qpixmap_s60_p.h b/src/gui/image/qpixmap_s60_p.h index 12885ec..42cc830 100644 --- a/src/gui/image/qpixmap_s60_p.h +++ b/src/gui/image/qpixmap_s60_p.h @@ -63,11 +63,6 @@ class CFbsBitGc; class QSymbianBitmapDataAccess; -class QS60PixmapData; -void qt_symbian_register_pixmap(QS60PixmapData *pd); -void qt_symbian_unregister_pixmap(QS60PixmapData *pd); -void qt_symbian_release_pixmaps(); - class QSymbianFbsHeapLock { public: |