diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-12-08 23:49:35 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-12-08 23:49:35 (GMT) |
commit | 3f84d75ed0806690eaceb606b95806f7c8a9c55e (patch) | |
tree | 9d12f1467b9ae0571ae905dea7c4eb55f5dfe181 /src/declarative | |
parent | 1616c62ceaded1a77cf49c6d05aa51814ac855bd (diff) | |
parent | 3ed9d026dd6ca23802f59bfc22333a8e753fa1dc (diff) | |
download | Qt-3f84d75ed0806690eaceb606b95806f7c8a9c55e.zip Qt-3f84d75ed0806690eaceb606b95806f7c8a9c55e.tar.gz Qt-3f84d75ed0806690eaceb606b95806f7c8a9c55e.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
-rw-r--r-- | src/declarative/graphicsitems/qmlgraphicstextedit.cpp | 3 | ||||
-rw-r--r-- | src/declarative/util/qnumberformat.cpp | 4 |
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('.')); |