diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2009-11-09 13:03:20 +0100 |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2009-11-09 13:03:20 +0100 |
| commit | cf417f787454f131f35248bb0c1294dadd777b45 (patch) | |
| tree | e5ad2f54887aa695c6f66ae2c305ab75ccabdac0 /src/gui/image/qpixmap.cpp | |
| parent | a7577f8c3ae3a025384d8d19fdf3575ef141a70b (diff) | |
| parent | e07878a9bcccbf063650272329c0aca14290b8e3 (diff) | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index dfeea76fe7..985a20b5f1 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -2150,6 +2150,13 @@ QPixmapData* QPixmap::pixmapData() const */ /*! \fn int QPixmap::numCols() const + \obsolete + \internal + \sa colorCount() +*/ + +/*! \fn int QPixmap::colorCount() const + \since 4.6 \internal */ |