summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap.cpp
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-02-04 14:00:37 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-02-04 14:00:37 (GMT)
commite39feabbcdb10b47c7eaad14fe653e62280e6237 (patch)
tree7e2918fc7bf7eacbd26c8e377bfb8e59543c04fb /src/gui/image/qpixmap.cpp
parent5f23d1635db832014b9d9acbf61e78ba52a9cc2f (diff)
downloadQt-e39feabbcdb10b47c7eaad14fe653e62280e6237.zip
Qt-e39feabbcdb10b47c7eaad14fe653e62280e6237.tar.gz
Qt-e39feabbcdb10b47c7eaad14fe653e62280e6237.tar.bz2
doc: Fixed some qdoc warnings.
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
-rw-r--r--src/gui/image/qpixmap.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index fe03c93..e51d858 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1379,10 +1379,11 @@ void QPixmap::deref()
*/
/*!
- Replaces this pixmap's data with the given \a image using the specified
- \a flags to control the conversion. The \a flags argument is a
- bitwise-OR of the \l{Qt::ImageConversionFlags}. Passing 0 for \a
- flags sets all the default options.
+ Replaces this pixmap's data with the given \a image using the
+ specified \a flags to control the conversion. The \a flags
+ argument is a bitwise-OR of the \l{Qt::ImageConversionFlags}.
+ Passing 0 for \a flags sets all the default options. Returns true
+ if the result is that this pixmap is not null.
Note: this function was part of Qt 3 support in Qt 4.6 and earlier.
It has been promoted to official API status in 4.7 to support updating