diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-06-03 14:08:54 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-06-04 13:06:01 (GMT) |
| commit | 33616d404d4f3eaafad78e4602a4e620a012a660 (patch) | |
| tree | 6da1befed41eb2b7fbcf7b01df34f0a052d819d3 /tests/auto/qstatictext/tst_qstatictext.cpp | |
| parent | 29ebd2ce78eb01a130470b8e5fe776efe130bdd8 (diff) | |
| download | Qt-33616d404d4f3eaafad78e4602a4e620a012a660.zip Qt-33616d404d4f3eaafad78e4602a4e620a012a660.tar.gz Qt-33616d404d4f3eaafad78e4602a4e620a012a660.tar.bz2 | |
Correct QStaticText tests after recent changes
Raster engine on Mac now correctly handles transformation, so no
need to XFAIL anymore. Also fixes a drawStaticText origin mistake,
the y origin should be the top left point rather than the baseline.
Change-Id: I6058e7099b336d9d5a6586344a07be3c7d76fb64
Reviewed-on: http://codereview.qt.nokia.com/329
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
(cherry picked from commit ea0e38c0ddb687f7873e0937e1b7130f1588c3d6)
Diffstat (limited to 'tests/auto/qstatictext/tst_qstatictext.cpp')
| -rw-r--r-- | tests/auto/qstatictext/tst_qstatictext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qstatictext/tst_qstatictext.cpp b/tests/auto/qstatictext/tst_qstatictext.cpp index 0c4857a..a924119 100644 --- a/tests/auto/qstatictext/tst_qstatictext.cpp +++ b/tests/auto/qstatictext/tst_qstatictext.cpp @@ -361,7 +361,7 @@ bool tst_QStaticText::supportsTransformations() const QPaintEngine::Type type = engine->type(); if (type == QPaintEngine::OpenGL -#if !defined(Q_WS_WIN) && !defined(Q_WS_X11) +#if !defined(Q_WS_WIN) && !defined(Q_WS_X11) && !defined(Q_WS_MAC) || type == QPaintEngine::Raster #endif ) @@ -601,7 +601,7 @@ void tst_QStaticText::setPenPlainText() QStaticText staticText("XXXXX"); staticText.setTextFormat(Qt::PlainText); - p.drawStaticText(0, fm.ascent(), staticText); + p.drawStaticText(0, 0, staticText); } QImage img = image.toImage(); |