diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 17:49:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 17:49:52 (GMT) |
| commit | ef0404ed32c2eee65cfca6137c2d9ebe67e1c5bd (patch) | |
| tree | c38a967ff974681ce4f392acd874a1be8961a84e /tests/auto/qwidget/tst_qwidget.cpp | |
| parent | 29a6377c6539840ca901bdcb045a42b7832ac98a (diff) | |
| parent | 61908af46700c7c1f2e59ce98daeadc2529fef1b (diff) | |
| download | Qt-ef0404ed32c2eee65cfca6137c2d9ebe67e1c5bd.zip Qt-ef0404ed32c2eee65cfca6137c2d9ebe67e1c5bd.tar.gz Qt-ef0404ed32c2eee65cfca6137c2d9ebe67e1c5bd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix signal emission of QDesktopWidget on Symbian.
Fixed gcce linker error when linking against s60main built by armcc.
Fixed plugin build key for Symbian builds under Linux.
Fixed package creation when shadow building.
Fix crash caused by not clearing the QPixmapCache on application exit.
Removed QEXPECT_FAIL macros from test cases which now pass
Ensure backing store is deleted before top-level window
Diffstat (limited to 'tests/auto/qwidget/tst_qwidget.cpp')
| -rw-r--r-- | tests/auto/qwidget/tst_qwidget.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index f20d27a..f722f89 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -9694,7 +9694,6 @@ void tst_QWidget::destroyBackingStoreWhenHidden() // Native child widget should once again share parent's backing store QVERIFY(0 != backingStore(parent)); - QEXPECT_FAIL("", "QTBUG-10643", Continue); QVERIFY(0 == backingStore(child)); } @@ -9743,7 +9742,7 @@ void tst_QWidget::destroyBackingStoreWhenHidden() QVERIFY(0 != backingStore(child)); // Parent is obscured, therefore its backing store should be destroyed - QEXPECT_FAIL("", "QTBUG-10643", Continue); + QEXPECT_FAIL("", "QTBUG-12406", Continue); QVERIFY(0 == backingStore(parent)); // Disable full screen @@ -9757,7 +9756,6 @@ void tst_QWidget::destroyBackingStoreWhenHidden() // Native child widget should once again share parent's backing store QVERIFY(0 != backingStore(parent)); - QEXPECT_FAIL("", "QTBUG-10643", Continue); QVERIFY(0 == backingStore(child)); } } |