diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-21 13:18:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-21 13:18:20 (GMT) |
| commit | 87c03292dce257f1f72d3fdc4e9457f1e1269ce2 (patch) | |
| tree | 2f18f87f0fc96349b3ae36687a8e4b31a0e089be /tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp | |
| parent | 43bce78bd5a41115ab5a541243cc3edcecd2904e (diff) | |
| parent | f14ac31c86eeb53d0b08c799ad0ad895d17475d6 (diff) | |
| download | Qt-87c03292dce257f1f72d3fdc4e9457f1e1269ce2.zip Qt-87c03292dce257f1f72d3fdc4e9457f1e1269ce2.tar.gz Qt-87c03292dce257f1f72d3fdc4e9457f1e1269ce2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Document section behavior when not ordered by section
Fix TextInput cursor position unchanged when selection length is 0.
Fix TextInput echoMode clearing inputMethodHints set by the user.
Elide has unexpected effect on Text's implicitWidth
Diffstat (limited to 'tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp index ca6e87a..82b6f73 100644 --- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp +++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp @@ -390,6 +390,13 @@ void tst_qdeclarativetext::elide() QCOMPARE(textObject->width(), 100.); } } + + // QTBUG-18627 + QUrl qmlfile = QUrl::fromLocalFile(SRCDIR "/data/elideimplicitwidth.qml"); + QDeclarativeComponent textComponent(&engine, qmlfile); + QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(textComponent.create()); + QVERIFY(item != 0); + QVERIFY(item->implicitWidth() > item->width()); } void tst_qdeclarativetext::textFormat() |