summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qlinecontrol.cpp
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-09-02 07:47:37 (GMT)
committeraxis <qt-info@nokia.com>2010-09-02 07:47:37 (GMT)
commit389921022ea903c1a3eab6e110afd9bff49e719b (patch)
tree487b9f3d8ce9f64018c8af94a3e7ffb8f7be9743 /src/gui/widgets/qlinecontrol.cpp
parentcbe62050c28bae3b1f251be72e28cfe509cea14c (diff)
downloadQt-389921022ea903c1a3eab6e110afd9bff49e719b.zip
Qt-389921022ea903c1a3eab6e110afd9bff49e719b.tar.gz
Qt-389921022ea903c1a3eab6e110afd9bff49e719b.tar.bz2
Revert "QLineEdit cursor is shown when asked to be non-visible"
This reverts commit 9ef61d3d1e53d32dc2568cbfb9f8ff5b19cb4ffc.
Diffstat (limited to 'src/gui/widgets/qlinecontrol.cpp')
-rw-r--r--src/gui/widgets/qlinecontrol.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index 69e6791..b6dfd13 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -464,8 +464,6 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event)
if (a.type == QInputMethodEvent::Cursor) {
m_preeditCursor = a.start;
m_hideCursor = !a.length;
- if (m_hideCursor)
- setCursorBlinkPeriod(0);
} else if (a.type == QInputMethodEvent::TextFormat) {
QTextCharFormat f = qvariant_cast<QTextFormat>(a.value).toCharFormat();
if (f.isValid()) {
@@ -529,7 +527,7 @@ void QLineControl::draw(QPainter *painter, const QPoint &offset, const QRect &cl
int cursor = m_cursor;
if (m_preeditCursor != -1)
cursor += m_preeditCursor;
- if (!m_hideCursor && (!m_blinkPeriod || m_blinkStatus))
+ if(!m_blinkPeriod || m_blinkStatus)
m_textLayout.drawCursor(painter, offset, cursor, m_cursorWidth);
}
}