projects
/
platform
/
upstream
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5b83c3c
)
Hide the default cursor if a cursor item is available.
author
Andrew den Exter
<andrew.den-exter@nokia.com>
Fri, 1 Jun 2012 01:47:12 +0000
(11:47 +1000)
committer
Qt by Nokia
<qt-info@nokia.com>
Tue, 5 Jun 2012 01:22:18 +0000
(
03:22
+0200)
Change-Id: I9ef3350a60ddd355ab588c9cfb3256004ee4493e
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
src/quick/items/qquicktextinput.cpp
patch
|
blob
|
history
diff --git
a/src/quick/items/qquicktextinput.cpp
b/src/quick/items/qquicktextinput.cpp
index
873cdd4
..
7589d1c
100644
(file)
--- a/
src/quick/items/qquicktextinput.cpp
+++ b/
src/quick/items/qquicktextinput.cpp
@@
-1723,7
+1723,7
@@
QSGNode *QQuickTextInput::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
if (cursorNode != 0 && !isReadOnly()) {
cursorNode->setRect(cursorRectangle());
- if (!d->cursorVisible || (!d->m_blinkStatus && d->m_blinkPeriod > 0)) {
+ if (!d->cursorVisible ||
d->cursorItem ||
(!d->m_blinkStatus && d->m_blinkPeriod > 0)) {
d->hideCursor();
} else {
d->showCursor();