diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 11:03:00 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 11:03:00 +1000 |
commit | aabda9f5c63ec37ff1669461de6a408bb4865fda (patch) | |
tree | 5d59d83c15f75dacad3036065603e0dd0a8e7727 /tests/auto/qheaderview | |
parent | eab70faca3ade07eb1a39f83a81887e42f483681 (diff) | |
parent | 6e50394c4eac9b3e91f6df7e944181cf7f54b0fe (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (84 commits)
Reduce usage of Q_ASSERT in autotests.
Fixed license header.
Remove Q_ASSERT's from qsharedmemory autotest
Remove Q_ASSERT's from QNetworkReply autotest
Remove Q_ASSERT from QXmlStream autotest
Remove Q_ASSERT's from QXmlStream autotest
Remove Q_ASSERT from QItemModel autotest
Remove Q_ASSERT's from QXmlStream autotest
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's from qreadwritelock autotest
Remove Q_ASSERT's from QObject autotest
Remove Q_ASSERT's from QObject autotest
Remove Q_ASSERT's from QNetworkReply autotest
Remove Q_ASSERT from qitemmodel autotest
Remove Q_ASSERT's from QMutex autotest
Remove Q_ASSERT from QMetaType autotest
Remove Q_ASSERT's in qitemview autotest
...
Diffstat (limited to 'tests/auto/qheaderview')
-rw-r--r-- | tests/auto/qheaderview/tst_qheaderview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qheaderview/tst_qheaderview.cpp b/tests/auto/qheaderview/tst_qheaderview.cpp index 9a25fb6bbc..d877d2f16e 100644 --- a/tests/auto/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/qheaderview/tst_qheaderview.cpp @@ -1106,7 +1106,7 @@ void tst_QHeaderView::moveAndInsertSection() void tst_QHeaderView::resizeMode() { - // Q_ASSERT's when resizeMode is called with an invalid index + // resizeMode must not be called with an invalid index int last = view->count() - 1; view->setResizeMode(QHeaderView::Interactive); QCOMPARE(view->resizeMode(last), QHeaderView::Interactive); |