diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-20 15:31:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-20 15:31:00 (GMT) |
| commit | 162e5480531af26b35ecd6920399e5f7a1594ce4 (patch) | |
| tree | cf8deb13efb2b9e122d37d3ff43b0c3799045e4b /tests/auto | |
| parent | 310a332a94ef4f82d352dabd33cfe38f6a4af472 (diff) | |
| parent | a7d4a808b4ee3e22042bd29e62ced4670c28ea89 (diff) | |
| download | Qt-162e5480531af26b35ecd6920399e5f7a1594ce4.zip Qt-162e5480531af26b35ecd6920399e5f7a1594ce4.tar.gz Qt-162e5480531af26b35ecd6920399e5f7a1594ce4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Don't allow posted events to starve native messages.
Fix autotest failure with experimental client deco
fix a translation bug in qt_zh_CN.ts
Add skeleton changes file for Qt 4.7.2
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qmainwindow/tst_qmainwindow.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/qmainwindow/tst_qmainwindow.cpp index e427863..c82c566 100644 --- a/tests/auto/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/qmainwindow/tst_qmainwindow.cpp @@ -701,10 +701,12 @@ void tst_QMainWindow::statusBar() // deleting the status bar should remove it from the main window QMainWindow mw; QStatusBar *sb = mw.statusBar(); - int indexOfSb = mw.layout()->indexOf(sb); + QMainWindowLayout *l = qFindChild<QMainWindowLayout *>(&mw); + QVERIFY(l); + int indexOfSb = l->indexOf(sb); QVERIFY(indexOfSb != -1); delete sb; - indexOfSb = mw.layout()->indexOf(sb); + indexOfSb = l->indexOf(sb); QVERIFY(indexOfSb == -1); } } |