diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-25 11:28:47 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-27 09:50:30 +0200 |
commit | 0c3d898a03b675c942e5c8a798b54676d3edf3ae (patch) | |
tree | 3e9ea3d434f80fc6bc43c9249c53a7d8b12cc180 /tests/auto/gui/text | |
parent | 3849455ee791d6f5cd4b87253732827d40e5d28a (diff) |
Tests: Remove Q_WS_QPA, qpa-sections from .profiles.
Compile without -qpa.
- Make Q_WS_QPA-#ifdefed sections the default in the code
- Replace some Q_WS_ by Q_OS_
- Add ### fixme for places that need checking
- Remove qpa conditionals from .pro files.
Change-Id: I6ea930afc0c236cc12a7b7e95f1b8a1c24b3a513
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/gui/text')
-rw-r--r-- | tests/auto/gui/text/qcssparser/tst_qcssparser.cpp | 4 | ||||
-rw-r--r-- | tests/auto/gui/text/qfont/tst_qfont.cpp | 6 | ||||
-rw-r--r-- | tests/auto/gui/text/qstatictext/tst_qstatictext.cpp | 13 |
3 files changed, 4 insertions, 19 deletions
diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp index 822b5275da..1166c014fa 100644 --- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp +++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp @@ -1593,12 +1593,10 @@ void tst_QCssParser::extractFontFamily() extractor.extractFont(&fnt, &adjustment); QFontInfo info(fnt); -#ifdef Q_WS_QPA // Note, we have to QSKIP rather than QEXPECT_FAIL because font lookup is broken // such that it may work or not work depending on the order in which fonts were - // loaded from disk + // loaded from disk: ### fixme: Check platforms QSKIP("QTBUG-20986 may fail on qpa"); -#endif QTEST(info.family(), "expectedFamily"); } diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index 3566342f00..a949c91362 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -80,9 +80,7 @@ private slots: void italicOblique(); void insertAndRemoveSubstitutions(); void serializeSpacing(); -#if !defined(Q_WS_QWS) && !defined(Q_WS_QPA) void lastResortFont(); -#endif #if defined(Q_WS_MAC) void styleName(); #endif @@ -611,13 +609,13 @@ void tst_QFont::serializeSpacing() // QFont::lastResortFont() may abort with qFatal() on QWS/QPA // if absolutely no font is found. Just as ducumented for QFont::lastResortFont(). // This happens on our CI machines which run QWS autotests. -#if !defined(Q_WS_QWS) && !defined(Q_WS_QPA) +// ### fixme: Check platforms void tst_QFont::lastResortFont() { + QSKIP("QFont::lastResortFont() may abort with qFatal() on QPA, QTBUG-22325"); QFont font; QVERIFY(!font.lastResortFont().isEmpty()); } -#endif #if defined(Q_WS_MAC) void tst_QFont::styleName() diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp index 4bd50008db..05854440c6 100644 --- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp +++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp @@ -388,18 +388,7 @@ bool tst_QStaticText::supportsTransformations() const { QPixmap pm(10, 10); QPainter p(&pm); - QPaintEngine *engine = p.paintEngine(); - - QPaintEngine::Type type = engine->type(); - - if (type == QPaintEngine::OpenGL -#if !defined(Q_WS_WIN) && !defined(Q_WS_X11) && !defined(Q_WS_MAC) && !defined(Q_WS_QPA) - || type == QPaintEngine::Raster -#endif - ) - return false; - - return true; + return p.paintEngine()->type() != QPaintEngine::OpenGL; } void tst_QStaticText::rotatedPainter() |