From e7e687f737c19eda884448b6991836a102f0f3f4 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Wed, 21 Oct 2009 14:14:26 +0100 Subject: Fixed logical error in winIdChanged auto test. The test (see 02fbfdbd) previously asserted that changing the parent of a native widget caused a WinIdChange event on Symbian, but not on other platforms. The test now asserts that: 1. Changing the parent of a native widget causes a WinIdChange event on all platforms. 2. Changing the grandparent of a native widget causes a WinIdChange event only on Symbian. Reviewed-by: Paul Olav Tvete --- tests/auto/qwidget/tst_qwidget.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index a03f112..050d1c5 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -4391,12 +4391,27 @@ void tst_QWidget::winIdChangeEvent() { // Changing parent of a native widget + // Should cause winId of child to change, on all platforms QWidget parent1, parent2; WinIdChangeWidget child(&parent1); const WId winIdBefore = child.winId(); QCOMPARE(child.m_winIdChangeEventCount, 1); child.setParent(&parent2); const WId winIdAfter = child.internalWinId(); + QVERIFY(winIdBefore != winIdAfter); + QCOMPARE(child.m_winIdChangeEventCount, 2); + } + + { + // Changing grandparent of a native widget + // Should cause winId of grandchild to change only on Symbian + QWidget grandparent1, grandparent2; + QWidget parent(&grandparent1); + WinIdChangeWidget child(&parent); + const WId winIdBefore = child.winId(); + QCOMPARE(child.m_winIdChangeEventCount, 1); + parent.setParent(&grandparent2); + const WId winIdAfter = child.internalWinId(); #ifdef Q_OS_SYMBIAN QVERIFY(winIdBefore != winIdAfter); QCOMPARE(child.m_winIdChangeEventCount, 2); -- cgit v0.12