diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-18 10:39:16 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-18 10:39:16 (GMT) |
| commit | 0b96a20f201dbd91599ee890f42dd8e452d15f79 (patch) | |
| tree | fbefbfe77e669f7d58a39c2be612a7098e6f7e17 /src/gui/widgets/qlabel.cpp | |
| parent | 379073630202d37cf8e3927dc9745134ac2f5512 (diff) | |
| parent | 7a64a3f67d53a99e6e2200f6481c98013004b4e4 (diff) | |
| download | Qt-0b96a20f201dbd91599ee890f42dd8e452d15f79.zip Qt-0b96a20f201dbd91599ee890f42dd8e452d15f79.tar.gz Qt-0b96a20f201dbd91599ee890f42dd8e452d15f79.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
src/script/qscriptclass.cpp
src/script/qscriptcontext.cpp
src/script/qscriptengine.cpp
src/script/qscriptvalue.cpp
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 fd97c8f..a9c7e12 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 |