diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-03 01:00:16 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-08-07 17:44:51 +0200 |
| commit | 053e7cce79d4bef99ec85101b0d22bbb171072c5 (patch) | |
| tree | c2059e82cccdea1fd0024c5942d1a834c28d39da /src/widgets/widgets/qlabel.cpp | |
| parent | a420d02538d28854914a6978c9637a0ddd652146 (diff) | |
| parent | f271dd8f960ad9f61697dfa57b26c4071441cadc (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/corelib/doc/src/objectmodel/signalsandslots.qdoc
src/plugins/platforms/cocoa/qcocoamenuloader.mm
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection.h
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
tests/auto/gui/image/qimage/tst_qimage.cpp
Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I9bd24ee9b00d4f26c8f344ce3970aa6e93935ff5
Diffstat (limited to 'src/widgets/widgets/qlabel.cpp')
| -rw-r--r-- | src/widgets/widgets/qlabel.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index 518c0275d3..60f88df9af 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -189,7 +189,7 @@ QLabelPrivate::~QLabelPrivate() #ifndef QT_NO_PICTURE /*! - Returns the label's picture or 0 if the label doesn't have a + Returns the label's picture or nullptr if the label doesn't have a picture. */ @@ -348,7 +348,7 @@ void QLabel::clear() \property QLabel::pixmap \brief the label's pixmap - If no pixmap has been set this will return 0. + If no pixmap has been set this will return nullptr. Setting the pixmap clears any previous content. The buddy shortcut, if any, is disabled. @@ -1157,7 +1157,7 @@ void QLabelPrivate::updateLabel() Alt+P. To unset a previously set buddy, call this function with \a buddy - set to 0. + set to nullptr. \sa buddy(), setText(), QShortcut, setAlignment() */ @@ -1187,7 +1187,7 @@ void QLabel::setBuddy(QWidget *buddy) /*! - Returns this label's buddy, or 0 if no buddy is currently set. + Returns this label's buddy, or nullptr if no buddy is currently set. \sa setBuddy() */ @@ -1339,7 +1339,7 @@ void QLabelPrivate::clearContents() #if QT_CONFIG(movie) /*! - Returns a pointer to the label's movie, or 0 if no movie has been + Returns a pointer to the label's movie, or nullptr if no movie has been set. \sa setMovie() |