diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-12-18 13:52:46 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-12-18 13:52:46 (GMT) |
| commit | 79a7b643231ac690ffeaaa53cc1ff7e8538a3056 (patch) | |
| tree | 87f4988bcfe1d59234882293214829a6fbee0cf5 /src/gui/widgets/qabstractspinbox_p.h | |
| parent | ba7927c84e0e1ed4df197e60b1c9eeec8ce1475c (diff) | |
| parent | e581386148a9615ef6c11eb3ae6735d0fa9668f6 (diff) | |
| download | Qt-79a7b643231ac690ffeaaa53cc1ff7e8538a3056.zip Qt-79a7b643231ac690ffeaaa53cc1ff7e8538a3056.tar.gz Qt-79a7b643231ac690ffeaaa53cc1ff7e8538a3056.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/widgets/qabstractspinbox_p.h')
| -rw-r--r-- | src/gui/widgets/qabstractspinbox_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/widgets/qabstractspinbox_p.h b/src/gui/widgets/qabstractspinbox_p.h index 3020cbc..55f94d7 100644 --- a/src/gui/widgets/qabstractspinbox_p.h +++ b/src/gui/widgets/qabstractspinbox_p.h @@ -98,7 +98,7 @@ public: void init(); void reset(); - void updateState(bool up); + void updateState(bool up, bool fromKeyboard = false); QString stripped(const QString &text, int *pos = 0) const; bool specialValue() const; virtual QVariant getZeroVariant() const; @@ -129,6 +129,7 @@ public: QVariant value, minimum, maximum, singleStep; QVariant::Type type; int spinClickTimerId, spinClickTimerInterval, spinClickThresholdTimerId, spinClickThresholdTimerInterval; + int effectiveSpinRepeatRate; uint buttonState; mutable QString cachedText; mutable QVariant cachedValue; |