Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update text autotests.
QTBUG-18040 has been fixed for Qt 5, we no longer need to skip these
tests on Mac.

Change-Id: Ie1883a75b105ca321388b3c4483110306e2a387c
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
  • Loading branch information
Michael Brasser authored and Qt by Nokia committed Jan 12, 2012
1 parent 5f19886 commit 668fff3
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
4 changes: 0 additions & 4 deletions tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp
Expand Up @@ -711,19 +711,16 @@ void tst_qquicktext::horizontalAlignment_RightToLeft()
QCOMPARE(text->hAlign(), QQuickText::AlignLeft);
QVERIFY(textPrivate->layout.lineAt(0).naturalTextRect().left() < canvas->width()/2);

#ifndef Q_OS_MAC // QTBUG-18040
// empty text with implicit alignment follows the system locale-based
// keyboard input direction from QApplication::keyboardInputDirection
text->setText("");
QCOMPARE(text->hAlign(), QApplication::keyboardInputDirection() == Qt::LeftToRight ?
QQuickText::AlignLeft : QQuickText::AlignRight);
text->setHAlign(QQuickText::AlignRight);
QCOMPARE(text->hAlign(), QQuickText::AlignRight);
#endif

delete canvas;

#ifndef Q_OS_MAC // QTBUG-18040
// alignment of Text with no text set to it
QString componentStr = "import QtQuick 2.0\nText {}";
QDeclarativeComponent textComponent(&engine);
Expand All @@ -732,7 +729,6 @@ void tst_qquicktext::horizontalAlignment_RightToLeft()
QCOMPARE(textObject->hAlign(), QApplication::keyboardInputDirection() == Qt::LeftToRight ?
QQuickText::AlignLeft : QQuickText::AlignRight);
delete textObject;
#endif
}

void tst_qquicktext::verticalAlignment()
Expand Down
4 changes: 0 additions & 4 deletions tests/auto/qtquick2/qquicktextedit/tst_qquicktextedit.cpp
Expand Up @@ -713,7 +713,6 @@ void tst_qquicktextedit::hAlign_RightToLeft()
// redundant as an actual input method may take care of it.
{ QInputMethodEvent ev; QGuiApplication::sendEvent(qGuiApp->inputPanel()->inputItem(), &ev); }

#ifndef Q_OS_MAC // QTBUG-18040
// empty text with implicit alignment follows the system locale-based
// keyboard input direction from QGuiApplication::keyboardInputDirection
textEdit->setText("");
Expand All @@ -726,9 +725,7 @@ void tst_qquicktextedit::hAlign_RightToLeft()
textEdit->setHAlign(QQuickTextEdit::AlignRight);
QCOMPARE(textEdit->hAlign(), QQuickTextEdit::AlignRight);
QVERIFY(textEdit->positionToRectangle(0).x() > canvas.width()/2);
#endif

#ifndef Q_OS_MAC // QTBUG-18040
// alignment of TextEdit with no text set to it
QString componentStr = "import QtQuick 2.0\nTextEdit {}";
QDeclarativeComponent textComponent(&engine);
Expand All @@ -737,7 +734,6 @@ void tst_qquicktextedit::hAlign_RightToLeft()
QCOMPARE(textObject->hAlign(), QGuiApplication::keyboardInputDirection() == Qt::LeftToRight ?
QQuickTextEdit::AlignLeft : QQuickTextEdit::AlignRight);
delete textObject;
#endif
}

void tst_qquicktextedit::vAlign()
Expand Down

0 comments on commit 668fff3

Please sign in to comment.