Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

2 files changed, 2 insertions, 5 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)));
 
diff --git a/src/declarative/util/qnumberformat.cpp b/src/declarative/util/qnumberformat.cpp
index c6a03e9..fd44db1 100644
--- a/src/declarative/util/qnumberformat.cpp
+++ b/src/declarative/util/qnumberformat.cpp
@@ -75,7 +75,7 @@ void QNumberFormat::handleFormat()
 {
     // ### is extremely messy 
     if (_format.isEmpty()) {
-        _text = QString(QLatin1String("%1")).arg(_number, -1, 'f', -1);
+        _text = QString::number(_number, 'f', -1);
         return;
     }
 
@@ -115,7 +115,7 @@ void QNumberFormat::handleFormat()
     }
 
     // round given the decimal length/precision
-    inputString = QString(QLatin1String("%1")).arg(_number, -1, 'f', decimalLength);
+    inputString = QString::number(_number, 'f', decimalLength);
 
     QStringList parts = inputString.split(QLatin1Char('.'));
     QStringList formatParts = _format.split(QLatin1Char('.'));