summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-03-17 04:02:17 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-03-17 04:02:17 (GMT)
commit36dcc2be63375da1f73d87565397fd11bf445bf8 (patch)
treebb62afdce97f2a2a4f5df6616cf2d2c1582bc3bf /tests/auto/declarative
parent7a8ed0580665e0240fc3539f29300606cfe7ccbc (diff)
downloadQt-36dcc2be63375da1f73d87565397fd11bf445bf8.zip
Qt-36dcc2be63375da1f73d87565397fd11bf445bf8.tar.gz
Qt-36dcc2be63375da1f73d87565397fd11bf445bf8.tar.bz2
Make states test work with smaller font size.
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/reset.qml4
-rw-r--r--tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativestates/data/reset.qml b/tests/auto/declarative/qdeclarativestates/data/reset.qml
index a0a2b8c..8e9b13a 100644
--- a/tests/auto/declarative/qdeclarativestates/data/reset.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/reset.qml
@@ -5,9 +5,9 @@ Rectangle {
height: 480
Text {
id: theText
- width: 50
+ width: 40
wrap: true
- text: "a text string that is longer than 50 pixels"
+ text: "a text string that is longer than 40 pixels"
}
states: State {
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index eb0e2bd..c16a870 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -955,12 +955,12 @@ void tst_qdeclarativestates::reset()
QDeclarativeText *text = rect->findChild<QDeclarativeText*>();
QVERIFY(text != 0);
- QCOMPARE(text->width(), qreal(50.));
+ QCOMPARE(text->width(), qreal(40.));
QVERIFY(text->width() < text->height());
rect->setState("state1");
- QVERIFY(text->width() > 51);
+ QVERIFY(text->width() > 41);
QVERIFY(text->width() > text->height());
}