diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-08 20:41:51 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-08 20:41:51 (GMT) |
commit | e1a97ef26c67a844be7c05af94270b25f013a673 (patch) | |
tree | 71fc6f5672b99c39a923c4223f3b2db608621f6d /tests | |
parent | 526705430be6371166464689e970752a5ce41ed6 (diff) | |
parent | aafc407fc3efaf6a7ee8f96623fc59857c7bc2a8 (diff) | |
download | Qt-e1a97ef26c67a844be7c05af94270b25f013a673.zip Qt-e1a97ef26c67a844be7c05af94270b25f013a673.tar.gz Qt-e1a97ef26c67a844be7c05af94270b25f013a673.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't cause repaints during painting in Text element
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp index 658f381..f683d98 100644 --- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp +++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp @@ -608,6 +608,17 @@ void tst_qdeclarativetext::style() QCOMPARE((int)textObject->style(), (int)styles.at(i)); QCOMPARE(textObject->styleColor(), QColor("white")); } + QString componentStr = "import Qt 4.7\nText { text: \"Hello World\" }"; + QDeclarativeComponent textComponent(&engine); + textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); + QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create()); + + QRectF brPre = textObject->boundingRect(); + textObject->setStyle(QDeclarativeText::Outline); + QRectF brPost = textObject->boundingRect(); + + QVERIFY(brPre.width() < brPost.width()); + QVERIFY(brPre.height() < brPost.height()); } void tst_qdeclarativetext::color() |