diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-21 13:49:08 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-24 08:53:06 +0200 |
commit | ceecaa430a334420d7c041277707a8e438438d5e (patch) | |
tree | 9964b1f46c5b1bc00cacb7889e711311f00ae735 | |
parent | 7ae5b578c7f88df0df9de6a2ca1cc271b66755f7 (diff) |
Tests: Remove Q_WS_QPA
Prepare for compilation without -qpa.
Change-Id: I8ec76d4ea3d045be457e728391462a8b195c8883
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 files changed, 1 insertions, 15 deletions
diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp index c14d41ac48..8c39c781c5 100644 --- a/tests/auto/declarative/examples/tst_examples.cpp +++ b/tests/auto/declarative/examples/tst_examples.cpp @@ -68,9 +68,7 @@ private: tst_examples::tst_examples() { // Add directories you want excluded here -#ifdef Q_WS_QPA excludedDirs << "examples/declarative/text/fonts"; // QTBUG-21415 -#endif // Not run in QQuickView excludedDirs << "examples/declarative/qtquick1"; diff --git a/tests/auto/declarative/qquickimage/tst_qquickimage.cpp b/tests/auto/declarative/qquickimage/tst_qquickimage.cpp index 3d7ee07d56..5106e3fc81 100644 --- a/tests/auto/declarative/qquickimage/tst_qquickimage.cpp +++ b/tests/auto/declarative/qquickimage/tst_qquickimage.cpp @@ -342,9 +342,7 @@ void tst_qquickimage::mirror() } QImage img = expected.toImage(); -#ifdef Q_WS_QPA QEXPECT_FAIL("", "QTBUG-21005 fails", Continue); -#endif QCOMPARE(screenshots[fillMode], img); } } diff --git a/tests/auto/declarative/qquicktext/tst_qquicktext.cpp b/tests/auto/declarative/qquicktext/tst_qquicktext.cpp index 2fd4e236d3..3a08dd208d 100644 --- a/tests/auto/declarative/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/declarative/qquicktext/tst_qquicktext.cpp @@ -1348,9 +1348,7 @@ void tst_qquicktext::lineHeight() qreal h = myText->height(); myText->setLineHeight(1.5); -#ifdef Q_WS_QPA QEXPECT_FAIL("", "QTBUG-21009 fails", Continue); -#endif QVERIFY(myText->height() == h * 1.5); myText->setLineHeightMode(QQuickText::FixedHeight); diff --git a/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp index 42a7fe1404..61daebb903 100644 --- a/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp +++ b/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp @@ -1322,9 +1322,7 @@ void tst_qdeclarativetext::lineHeight() qreal h = myText->height(); myText->setLineHeight(1.5); -#ifdef Q_WS_QPA QEXPECT_FAIL("", "QTBUG-21015 fails", Continue); -#endif QVERIFY(myText->height() == h * 1.5); myText->setLineHeightMode(QDeclarative1Text::FixedHeight); diff --git a/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp index ff080cc1f2..c01f1290ac 100644 --- a/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -1336,10 +1336,8 @@ void tst_qdeclarativetextinput::positionAt() pos = textinputObject->positionAt(textinputObject->width()/2); diff = abs(int(fm.width(textinputObject->text().left(pos))-textinputObject->width()/2)); -#ifdef Q_WS_QPA QEXPECT_FAIL("", "QTBUG-21017 fails", Continue); -#endif - // some tollerance for different fonts. + // some tolerance for different fonts. #ifdef Q_OS_LINUX QVERIFY(diff < 2); #else @@ -2407,9 +2405,7 @@ void tst_qdeclarativetextinput::setHAlignClearCache() view.show(); QApplication::setActiveWindow(&view); QTest::qWaitForWindowShown(&view); -#ifdef Q_WS_QPA QEXPECT_FAIL("", "QTBUG-21017 fails", Abort); -#endif QTRY_COMPARE(input.nbPaint, 1); input.setHAlign(QDeclarative1TextInput::AlignRight); QApplication::processEvents(); @@ -2518,9 +2514,7 @@ void tst_qdeclarativetextinput::preeditAutoScroll() // test the text is scrolled so the preedit is visible. ic.sendPreeditText(preeditText.mid(0, 3), 1); -#ifdef Q_WS_QPA QEXPECT_FAIL("", "QTBUG-21017 fails", Abort); -#endif QVERIFY(input.positionAt(0) != 0); QVERIFY(input.cursorRectangle().left() < input.boundingRect().width()); QCOMPARE(cursorRectangleSpy.count(), ++cursorRectangleChanges); |