diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-07 22:00:10 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-07 22:00:10 (GMT) |
| commit | 981cdbb067bc60fc9eb0e448f57ff84f39d235ca (patch) | |
| tree | 4ad4bf72f41b393a7a1119ac1ad15d3692a4b98d /src/gui/image/qpixmap_s60_p.h | |
| parent | 8246896de49f2f2f5715d5986f415065aebd3e20 (diff) | |
| parent | 190adb6dc8fe1b97d61a4cb09c77c71d7c0797b6 (diff) | |
| download | Qt-981cdbb067bc60fc9eb0e448f57ff84f39d235ca.zip Qt-981cdbb067bc60fc9eb0e448f57ff84f39d235ca.tar.gz Qt-981cdbb067bc60fc9eb0e448f57ff84f39d235ca.tar.bz2 | |
Merge branch '4.7-oslo1' into 4.7-doc
Diffstat (limited to 'src/gui/image/qpixmap_s60_p.h')
| -rw-r--r-- | src/gui/image/qpixmap_s60_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/qpixmap_s60_p.h b/src/gui/image/qpixmap_s60_p.h index a82f5c2..12885ec 100644 --- a/src/gui/image/qpixmap_s60_p.h +++ b/src/gui/image/qpixmap_s60_p.h @@ -128,9 +128,9 @@ private: QS60PixmapData *next; QS60PixmapData *prev; - friend void qt_symbian_register_pixmap(QS60PixmapData *pd); - friend void qt_symbian_unregister_pixmap(QS60PixmapData *pd); - friend void qt_symbian_release_pixmaps(); + static void qt_symbian_register_pixmap(QS60PixmapData *pd); + static void qt_symbian_unregister_pixmap(QS60PixmapData *pd); + static void qt_symbian_release_pixmaps(); friend class QPixmap; friend class QS60WindowSurface; |