Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Tests: Remove Q_WS_QPA
Prepare for compilation without -qpa.

Change-Id: I8ec76d4ea3d045be457e728391462a8b195c8883
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
  • Loading branch information
Friedemann Kleint authored and Qt by Nokia committed Oct 24, 2011
1 parent 7ae5b57 commit ceecaa4
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 15 deletions.
2 changes: 0 additions & 2 deletions tests/auto/declarative/examples/tst_examples.cpp
Expand Up @@ -68,9 +68,7 @@ private slots:
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";
Expand Down
2 changes: 0 additions & 2 deletions tests/auto/declarative/qquickimage/tst_qquickimage.cpp
Expand Up @@ -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);
}
}
Expand Down
2 changes: 0 additions & 2 deletions tests/auto/declarative/qquicktext/tst_qquicktext.cpp
Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp
Expand Up @@ -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);
Expand Down
Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit ceecaa4

Please sign in to comment.