diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-04 10:33:24 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-04 10:33:24 (GMT) |
| commit | 67ae1b0dac175f48875507f3187ed49276a29ddf (patch) | |
| tree | f8367c5f583a7d279ad137ec88517f36004ca89b /src/gui/widgets/qdatetimeedit.cpp | |
| parent | 4aafbd6222e7aeafd59a4a4356ba8c53b2bfa1d1 (diff) | |
| download | Qt-67ae1b0dac175f48875507f3187ed49276a29ddf.zip Qt-67ae1b0dac175f48875507f3187ed49276a29ddf.tar.gz Qt-67ae1b0dac175f48875507f3187ed49276a29ddf.tar.bz2 | |
Fix more compile breakages after merging qt/master-stable.
A lot of the logic was factored out of QLineEdit(Private) and into a
private class called QLineControl, however the changes did not compile
when keypad navigation is enabled so fix them.
Diffstat (limited to 'src/gui/widgets/qdatetimeedit.cpp')
| -rw-r--r-- | src/gui/widgets/qdatetimeedit.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp index db57b43..1533edb 100644 --- a/src/gui/widgets/qdatetimeedit.cpp +++ b/src/gui/widgets/qdatetimeedit.cpp @@ -1086,10 +1086,7 @@ void QDateTimeEdit::keyPressEvent(QKeyEvent *event) //hide cursor d->edit->d_func()->setCursorVisible(false); - if (d->edit->d_func()->cursorTimer > 0) - killTimer(d->edit->d_func()->cursorTimer); - d->edit->d_func()->cursorTimer = 0; - + d->edit->d_func()->control->setCursorBlinkPeriod(0); d->setSelected(0); } } @@ -1110,10 +1107,7 @@ void QDateTimeEdit::keyPressEvent(QKeyEvent *event) //hide cursor d->edit->d_func()->setCursorVisible(false); - if (d->edit->d_func()->cursorTimer > 0) - killTimer(d->edit->d_func()->cursorTimer); - d->edit->d_func()->cursorTimer = 0; - + d->edit->d_func()->control->setCursorBlinkPeriod(0); d->setSelected(0); oldCurrent = 0; } |