diff options
| -rw-r--r-- | src/corelib/tools/qmargins.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qfontmetrics/tst_qfontmetrics.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qhostinfo/tst_qhostinfo.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/tools/qmargins.cpp b/src/corelib/tools/qmargins.cpp index 2150ccb..f5441a3 100644 --- a/src/corelib/tools/qmargins.cpp +++ b/src/corelib/tools/qmargins.cpp @@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE /*! \class QMargins \ingroup painting + \since 4.6 \brief The QMargins class defines the four margins of a rectangle. 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); |