summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativetext
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2010-06-30 07:10:33 (GMT)
committerJoona Petrell <joona.t.petrell@nokia.com>2010-07-02 04:12:40 (GMT)
commit37792d20eeef870a0d695fc15bc943f20275be9a (patch)
treeaa5ed14a44e8ab2edc7c3100f9c6226506c94e59 /tests/auto/declarative/qdeclarativetext
parent3256aad1195e28509a89f217bcad8435f46fe1e5 (diff)
downloadQt-37792d20eeef870a0d695fc15bc943f20275be9a.zip
Qt-37792d20eeef870a0d695fc15bc943f20275be9a.tar.gz
Qt-37792d20eeef870a0d695fc15bc943f20275be9a.tar.bz2
Fix TextInput text getting improperly clipped
Task-number: QTBUG-11790 Reviewed-by: Martin Jones
Diffstat (limited to 'tests/auto/declarative/qdeclarativetext')
-rw-r--r--tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
index 8a4f152..80198eb 100644
--- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
+++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -48,6 +48,7 @@
#include <QGraphicsSceneMouseEvent>
#include <qmath.h>
#include <QDeclarativeView>
+#include <private/qapplication_p.h>
#include "../../../shared/util.h"
#include "testhttpserver.h"
@@ -452,7 +453,9 @@ void tst_qdeclarativetext::alignments()
#ifdef Q_WS_X11
// Font-specific, but not likely platform-specific, so only test on one platform
- QCOMPARE(actual,expect);
+ if (QApplicationPrivate::graphics_system_name == "raster" || QApplicationPrivate::graphics_system_name == "") {
+ QCOMPARE(actual,expect);
+ }
#endif
}