aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qtquick2/qquicktext
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-12-20 15:31:13 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-20 07:33:37 +0100
commitb26bda8654e9ac4c8ede56adba9d597f24f1ecac (patch)
treef450ef5680c642398706f1263fb121165ac5f04a /tests/auto/qtquick2/qquicktext
parent657f6d7111a4ee6f3e8ef0919956990fc8abbf3d (diff)
Small Text creation performance improvements.
Change-Id: Ie92129887730d3738e14116cf22e1c30b836a415 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/qtquick2/qquicktext')
-rw-r--r--tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp b/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp
index 09e7b9c577..88a8b6d819 100644
--- a/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp
+++ b/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp
@@ -1443,10 +1443,12 @@ void tst_qquicktext::lineLaidOut()
QTextDocument *doc = textPrivate->textDocument();
QVERIFY(doc == 0);
+#if defined(Q_OS_MAC)
QVERIFY(myText->lineCount() == textPrivate->linesRects.count());
+#endif
- for (int i = 0; i < textPrivate->linesRects.count(); ++i) {
- QRectF r = textPrivate->linesRects.at(i);
+ for (int i = 0; i < textPrivate->layout.lineCount(); ++i) {
+ QRectF r = textPrivate->layout.lineAt(i).rect();
QVERIFY(r.width() == i * 15);
if (i >= 30)
QVERIFY(r.x() == r.width() + 30);