summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-12-08 07:36:43 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-12-08 07:36:43 (GMT)
commitc115ca5a025cedcbb5a34863918b22aac860f66a (patch)
treefbd78e336771f6c5c09ec736e3bcb20671b23314
parent7cfbd79775692b3acc98cfd39d6a6384f3b59b89 (diff)
downloadQt-c115ca5a025cedcbb5a34863918b22aac860f66a.zip
Qt-c115ca5a025cedcbb5a34863918b22aac860f66a.tar.gz
Qt-c115ca5a025cedcbb5a34863918b22aac860f66a.tar.bz2
It *did* make it into 4.6.0.
See commit fab1ce65da8bacfce92b1df7656780e729d31b74.
-rw-r--r--src/declarative/graphicsitems/qmlgraphicstextedit.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
index 0b8bc83..747e2fb 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
@@ -871,10 +871,7 @@ void QmlGraphicsTextEditPrivate::init()
q->setFlag(QGraphicsItem::ItemAcceptsInputMethod);
control = new QTextControl(q);
-
-#if QT_VERSION >= 0x040601 // XXX see bug QT-2236
control->setIgnoreUnusedNavigationEvents(true);
-#endif
QObject::connect(control, SIGNAL(updateRequest(QRectF)), q, SLOT(updateImgCache(QRectF)));