summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-12-08 05:47:50 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-12-08 05:47:50 (GMT)
commit06d949102aa44ab4764f97cdb606b02d3dfe04c9 (patch)
tree5ab51a0e345ecda3c1bfc8bfa38825e3ea22adee
parentcb745eacdb1c1e009f7f115d88dd03bdb9c16180 (diff)
downloadQt-06d949102aa44ab4764f97cdb606b02d3dfe04c9.zip
Qt-06d949102aa44ab4764f97cdb606b02d3dfe04c9.tar.gz
Qt-06d949102aa44ab4764f97cdb606b02d3dfe04c9.tar.bz2
Compile with 4.6.x
-rw-r--r--src/declarative/graphicsitems/qmlgraphicstextedit.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
index 747e2fb..4bd3a49 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
@@ -871,7 +871,10 @@ void QmlGraphicsTextEditPrivate::init()
q->setFlag(QGraphicsItem::ItemAcceptsInputMethod);
control = new QTextControl(q);
+
+#if QT_VERSION >= 0x040700 // XXX see bug QT-2236
control->setIgnoreUnusedNavigationEvents(true);
+#endif
QObject::connect(control, SIGNAL(updateRequest(QRectF)), q, SLOT(updateImgCache(QRectF)));