diff options
author | David Boddie <dboddie@trolltech.com> | 2009-08-17 20:16:13 +0200 |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2009-08-17 20:16:13 +0200 |
commit | 42e342d1b3924206c7fa4175cb064dc2bbe0f00c (patch) | |
tree | 12f01bb114f956dd257507f0106c39d5a5247a12 /src/gui/widgets/qlabel.cpp | |
parent | 7332e42363eb93f1de032319439a7250e16b3b12 (diff) | |
parent | f37c1ea90b4265f1e2b2e7de9bbb0a021ca230d6 (diff) | |
download | qt4-tools-42e342d1b3924206c7fa4175cb064dc2bbe0f00c.tar.gz |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/widgets/qlabel.cpp')
-rw-r--r-- | src/gui/widgets/qlabel.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/widgets/qlabel.cpp b/src/gui/widgets/qlabel.cpp index fd97c8f4c4..a9c7e1205c 100644 --- a/src/gui/widgets/qlabel.cpp +++ b/src/gui/widgets/qlabel.cpp @@ -61,8 +61,6 @@ QT_BEGIN_NAMESPACE \brief The QLabel widget provides a text or image display. \ingroup basicwidgets - \ingroup text - \mainclass QLabel is used for displaying text or an image. No user interaction functionality is provided. The visual appearance of |