diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-09-03 14:36:15 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-09-03 14:36:15 (GMT) |
| commit | f0844f9da7a834c282f6f04b2676f28de444e9dc (patch) | |
| tree | 8e121429e25959043cc04c4364adbe8239e44a67 /src/gui/image/qbitmap.cpp | |
| parent | fe763ef6cd255ccb54d0de1894c1a772f959585e (diff) | |
| parent | f360180890298618ef3284c08789c2a243e1ba9d (diff) | |
| download | Qt-f0844f9da7a834c282f6f04b2676f28de444e9dc.zip Qt-f0844f9da7a834c282f6f04b2676f28de444e9dc.tar.gz Qt-f0844f9da7a834c282f6f04b2676f28de444e9dc.tar.bz2 | |
Merge commit 'qt/4.6' into kinetic-declarativeui
Diffstat (limited to 'src/gui/image/qbitmap.cpp')
| -rw-r--r-- | src/gui/image/qbitmap.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp index 8c3b9be..b5ffeed 100644 --- a/src/gui/image/qbitmap.cpp +++ b/src/gui/image/qbitmap.cpp @@ -92,13 +92,15 @@ QT_BEGIN_NAMESPACE \sa QPixmap, QImage, QImageReader, QImageWriter */ +/*! \typedef QBitmap::DataPtr + \internal + */ /*! Constructs a null bitmap. \sa QPixmap::isNull() */ - QBitmap::QBitmap() : QPixmap(QSize(0, 0), QPixmapData::BitmapType) { |