diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 00:58:00 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 00:58:00 +1000 |
commit | cb2980a09aefcc207eacb500d5a3c74f064859dd (patch) | |
tree | b119109514d04a7afa503ecd08a774483821c8d8 /tests/auto/qtextedit | |
parent | 4109badc4321effeeb798dd101479be7dffdbe3d (diff) | |
parent | 5aa1cbcdacd19b2e526e358eddac1b7d55a994b5 (diff) |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: (114 commits)
Fixed license header.
Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
Remove Q_ASSERT's from qsharedmemory autotest
Remove Q_ASSERT's from QNetworkReply autotest
Remove Q_ASSERT's from qabstractxmlnodemodel test
Remove Q_ASSERT from QXmlStream autotest
Remove Q_ASSERT from qxmlquery autotest
Remove Q_ASSERT's from QXmlStream autotest
Remove Q_ASSERT from QItemModel autotest
Remove Q_ASSERT's from qxmlquery autotest
Remove Q_ASSERT from qxmlquery autotest
Remove Q_ASSERT's from QXmlStream autotest
Remove Q_ASSERT from qabstractxmlnodemodel test
Remove Q_ASSERT from qscriptvaluegenerated test
Remove Q_ASSERT from QVariant autotest
Remove Q_ASSERT's from QTreeView autotest
Remove Q_ASSERT from qtesselator autotest
Remove unused function from qtessellator autotest
Remove Q_ASSERT from qscriptvaluegenerated test
Remove Q_ASSERT's from qscriptvaluegenerated test
...
Diffstat (limited to 'tests/auto/qtextedit')
-rw-r--r-- | tests/auto/qtextedit/tst_qtextedit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp index 992d2f2682..6b9a541bf2 100644 --- a/tests/auto/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/qtextedit/tst_qtextedit.cpp @@ -317,7 +317,7 @@ void tst_QTextEdit::getSetCheck() // void QTextEdit::setFontPointSize(qreal) obj1.setFontPointSize(qreal(1.1)); QCOMPARE(qreal(1.1), obj1.fontPointSize()); - // we currently Q_ASSERT_X in QFont::setPointSizeF for that + // we currently assert in QFont::setPointSizeF for that //obj1.setFontPointSize(0.0); //QCOMPARE(1.1, obj1.fontPointSize()); // Should not accept 0.0 => keep old @@ -327,7 +327,7 @@ void tst_QTextEdit::getSetCheck() QCOMPARE(1, obj1.fontWeight()); // Range<1, 99> obj1.setFontWeight(99); QCOMPARE(99, obj1.fontWeight()); // Range<1, 99> - /* Q_ASSERT_X in qfont.cpp + /* assertion in qfont.cpp obj1.setFontWeight(INT_MIN); QCOMPARE(1, obj1.fontWeight()); // Range<1, 99> obj1.setFontWeight(INT_MAX); @@ -2064,7 +2064,7 @@ void tst_QTextEdit::compareWidgetAndImage(QTextEdit &widget, const QString &imag QCOMPARE(original.isNull(), false); QCOMPARE(original.size(), image.size()); - Q_ASSERT(image.depth() == 32); + QCOMPARE(image.depth(), 32); QCOMPARE(original.depth(), image.depth()); const int bytesPerLine = image.bytesPerLine(); |