diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-26 23:37:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-26 23:37:57 (GMT) |
| commit | 8f21474fb8b8d51d00d71f566e1b291b926b42bd (patch) | |
| tree | 8d75d6d21c1e55a2866e11aa1bb9f0f922299672 /tests | |
| parent | 47769726d3d8db03153acfcd9552fd9bc0535358 (diff) | |
| parent | 5d7c1a1148d4c779cbcb5242ac6106c6ee35d57b (diff) | |
| download | Qt-8f21474fb8b8d51d00d71f566e1b291b926b42bd.zip Qt-8f21474fb8b8d51d00d71f566e1b291b926b42bd.tar.gz Qt-8f21474fb8b8d51d00d71f566e1b291b926b42bd.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:
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')
| -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)); } } |