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/qwidget | |
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/qwidget')
-rw-r--r-- | tests/auto/qwidget/tst_qwidget.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index e266efb794..f33bdbb3e0 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -7233,8 +7233,7 @@ void tst_QWidget::render_systemClip2() QFETCH(bool, usePaintEvent); QFETCH(QColor, expectedColor); - Q_ASSERT_X(expectedColor != QColor(Qt::red), Q_FUNC_INFO, - "Qt::red is the reference color for the image, pick another color"); + QVERIFY2(expectedColor != QColor(Qt::red), "Qt::red is the reference color for the image, pick another color"); class MyWidget : public QWidget { @@ -10397,7 +10396,7 @@ void tst_QWidget::taskQTBUG_7532_tabOrderWithFocusProxy() w.setFocusProxy(fp); QWidget::setTabOrder(&w, fp); - // No Q_ASSERT, then it's allright. + // In debug mode, no assertion failure means it's alright. } void tst_QWidget::movedAndResizedAttributes() |