diff options
author | Nico Vertriest <nico.vertriest@digia.com> | 2015-05-19 15:03:12 +0200 |
---|---|---|
committer | Nico Vertriest <nico.vertriest@digia.com> | 2015-07-22 13:47:23 +0000 |
commit | e6ddae07e1e571a7a6e0c531b961dbddcd217643 (patch) | |
tree | 84c366f499a91152456cc8a85995d97ec6bc6e94 /src/gui/image | |
parent | 9499cf33b7284d1a2626fecc1abde75e1dc52c23 (diff) |
Doc:added doc to undocumented functions
Task-number: QTBUG-36985
Change-Id: Ic358682b276d67ef804f727bcf14191718613469
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/gui/image')
-rw-r--r-- | src/gui/image/qicon.cpp | 7 | ||||
-rw-r--r-- | src/gui/image/qimage.cpp | 4 | ||||
-rw-r--r-- | src/gui/image/qpixmapcache.cpp | 14 |
3 files changed, 25 insertions, 0 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index cafc966fbb..66bb77795e 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -631,6 +631,13 @@ QIcon::QIcon(const QIcon &other) } /*! + \fn QIcon::QIcon(QIcon &&other) + + Move-constructs a QIcon instance, making it point to the same object + that \a other was pointing to. +*/ + +/*! Constructs an icon from the file with the given \a fileName. The file will be loaded on demand. diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index cd0cbf7f49..f0b3e89033 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -4256,6 +4256,10 @@ int QImage::bitPlaneCount() const return bpc; } +/*! + Returns a smoothly scaled copy of the image. The returned image has a size + of width \a w by height \a h pixels. +*/ QImage QImage::smoothScaled(int w, int h) const { QImage src = *this; switch (src.format()) { diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index f9c362e194..3836976975 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -660,5 +660,19 @@ QList< QPair<QString,QPixmap> > QPixmapCache::allPixmaps() { return pm_cache()->allPixmaps(); } +/*! + \fn QPixmapCache::KeyData::KeyData() + + \internal +*/ +/*! + \fn QPixmapCache::KeyData::KeyData(const KeyData &other) + \internal +*/ +/*! + \fn QPixmapCache::KeyData::~KeyData() + + \internal +*/ QT_END_NAMESPACE |