aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquicktext
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2012-07-10 15:35:57 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-16 04:47:44 +0200
commit7ddd5308946f32f4f0514c493a0a0f01c2bdc840 (patch)
tree3a894e4bc399bce83f284a2142b4552ee1731efd /tests/auto/quick/qquicktext
parentec949bad2d393a0e9471dc8c82f59b8444bccfd6 (diff)
Remove unneeded mac specific code in QQuickText
We don't need to relayout in painting thread. Task-number: QTBUG-26361 Change-Id: Idfad1b90e2772e72411df821d02ea596a094f508 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquicktext')
-rw-r--r--tests/auto/quick/qquicktext/tst_qquicktext.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
index 7a7f5cc053..c16da4cc8d 100644
--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
@@ -2450,10 +2450,6 @@ void tst_qquicktext::lineLaidOut()
QVERIFY(!textPrivate->extra.isAllocated());
-#if defined(Q_OS_MAC)
- QVERIFY(myText->lineCount() == textPrivate->linesRects.count());
-#endif
-
for (int i = 0; i < textPrivate->layout.lineCount(); ++i) {
QRectF r = textPrivate->layout.lineAt(i).rect();
QVERIFY(r.width() == i * 15);
@@ -2484,10 +2480,6 @@ void tst_qquicktext::lineLaidOutRelayout()
QVERIFY(!textPrivate->extra.isAllocated());
-#if defined(Q_OS_MAC)
- QVERIFY(myText->lineCount() == textPrivate->linesRects.count());
-#endif
-
qreal maxH = 0;
for (int i = 0; i < textPrivate->layout.lineCount(); ++i) {
QRectF r = textPrivate->layout.lineAt(i).rect();