diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-10 13:13:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-10 13:13:55 +0200 |
| commit | 776ddcab2c6f06d8d66c645eb34038ffaa60e08e (patch) | |
| tree | a226f703904c88ed1be6f8fffa381823d12125d1 /src/widgets/widgets | |
| parent | 6d166c88220ee09821b65fb2b711fa77a5312971 (diff) | |
| parent | f035786021e9f7b1d9512b22774bc15553caaedb (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qwidgetlinecontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp index 1f70dd719b..b927004773 100644 --- a/src/widgets/widgets/qwidgetlinecontrol.cpp +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp @@ -1474,7 +1474,7 @@ void QWidgetLineControl::setCursorBlinkPeriod(int msec) if (m_blinkTimer) { killTimer(m_blinkTimer); } - if (msec && !m_readOnly) { + if (msec > 0 && !m_readOnly) { m_blinkTimer = startTimer(msec / 2); m_blinkStatus = 1; } else { |