diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-07 17:21:30 +1000 |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-07 17:21:30 +1000 |
| commit | a3c1b0703575ed5fc364011c73dc104ecdb8ef0c (patch) | |
| tree | 4e57559b1753c7b1eb3f375aa59eee6ea1108f70 /src/gui/widgets/qlcdnumber.h | |
| parent | f9ffe24a87d67f39bb877224f7e2b6f7b3ad6c02 (diff) | |
| parent | 7a5bca82738e6b782047e50a813972eccd928307 (diff) | |
| download | qt4-tools-a3c1b0703575ed5fc364011c73dc104ecdb8ef0c.tar.gz | |
Merge branch '4.6' of ../../4.6 into 4.6
Conflicts:
examples/multimedia/audiodevices/audiodevices.cpp
Diffstat (limited to 'src/gui/widgets/qlcdnumber.h')
| -rw-r--r-- | src/gui/widgets/qlcdnumber.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/widgets/qlcdnumber.h b/src/gui/widgets/qlcdnumber.h index e65637deef..b7162cd765 100644 --- a/src/gui/widgets/qlcdnumber.h +++ b/src/gui/widgets/qlcdnumber.h @@ -82,9 +82,10 @@ public: }; bool smallDecimalPoint() const; - +#ifdef QT_DEPRECATED QT_DEPRECATED int numDigits() const; QT_DEPRECATED void setNumDigits(int nDigits); +#endif int digitCount() const; void setDigitCount(int nDigits); |