summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-11-13 09:51:04 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-11-13 09:51:11 (GMT)
commit63856f13721bce420fe94dab31c36329af976276 (patch)
tree5a2c1d5d49a76a7794fcfd46a6fa664f657ae0fe /src/gui/widgets
parentf5c5cc585cef8d2d2f77e7d83d7a07c6d70f0d09 (diff)
parent6e209bb09f3feef210bc65f94cf8f58dd8e3b4a9 (diff)
downloadQt-63856f13721bce420fe94dab31c36329af976276.zip
Qt-63856f13721bce420fe94dab31c36329af976276.tar.gz
Qt-63856f13721bce420fe94dab31c36329af976276.tar.bz2
Merge commit upstream/4.6 into oslo-staging-2/4.6
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/qlcdnumber.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qlcdnumber.cpp b/src/gui/widgets/qlcdnumber.cpp
index 3497eba..69c52cf 100644
--- a/src/gui/widgets/qlcdnumber.cpp
+++ b/src/gui/widgets/qlcdnumber.cpp
@@ -441,10 +441,10 @@ QLCDNumber::~QLCDNumber()
/*!
- \obsolete
+ \deprecated
\property QLCDNumber::numDigits
\brief the current number of digits displayed
- \sa setDigitCount()
+ \sa digitCount
*/
void QLCDNumber::setNumDigits(int numDigits)