diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-09-09 12:47:30 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-09 12:47:30 (GMT) |
| commit | f3533b1b885587513d894d3fc2a65aa5837e7161 (patch) | |
| tree | c312fe5b1c46b7fe4635d6529d48f5a8bab2af66 /tests | |
| parent | e6e61be80973e2fcf9a57c5b6472f913e5846991 (diff) | |
| parent | cecd085b4e084d8365b83b56cb261a71430e8dd2 (diff) | |
| download | Qt-f3533b1b885587513d894d3fc2a65aa5837e7161.zip Qt-f3533b1b885587513d894d3fc2a65aa5837e7161.tar.gz Qt-f3533b1b885587513d894d3fc2a65aa5837e7161.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qfontmetrics/tst_qfontmetrics.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qhostinfo/tst_qhostinfo.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp index e33c938..1511d33 100644 --- a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp +++ b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp @@ -213,10 +213,10 @@ void tst_QFontMetrics::elidedMultiLength() int width_long = fm.width(text1_long); QCOMPARE(fm.elidedText(text1,Qt::ElideRight, 8000), text1_long); QCOMPARE(fm.elidedText(text1,Qt::ElideRight, width_long + 1), text1_long); - QCOMPARE(fm.elidedText(text1,Qt::ElideRight, width_long - 1), text1_short); + QCOMPARE(fm.elidedText(text1,Qt::ElideRight, width_long - 2), text1_short); int width_short = fm.width(text1_short); QCOMPARE(fm.elidedText(text1,Qt::ElideRight, width_short + 1), text1_short); - QCOMPARE(fm.elidedText(text1,Qt::ElideRight, width_short - 1), text1_small); + QCOMPARE(fm.elidedText(text1,Qt::ElideRight, width_short - 2), text1_small); // Not even wide enough for "small" - should use ellipsis QChar ellipsisChar(0x2026); diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp index d5be332..ac6adf7 100644 --- a/tests/auto/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp @@ -243,7 +243,7 @@ void tst_QHostInfo::lookupIPv4() lookupDone = false; QHostInfo::lookupHost(hostname, this, SLOT(resultsReady(const QHostInfo&))); - QTestEventLoop::instance().enterLoop(3); + QTestEventLoop::instance().enterLoop(10); QVERIFY(!QTestEventLoop::instance().timeout()); QVERIFY(lookupDone); |