summaryrefslogtreecommitdiffstats
path: root/tests/auto/qwidget
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2009-06-09 09:41:38 (GMT)
committerAlexis Menard <alexis.menard@nokia.com>2009-06-09 09:41:38 (GMT)
commitbc3abd32ed1c5a872d7a7817c1af0a13f442d536 (patch)
tree37d617a7baf54844bb4c396628b867ecb3b0b29e /tests/auto/qwidget
parent6d25d222b2bb418139e123b59366db908ee3188a (diff)
parent91ceb21d1d5f6447a47853b6625fb51d2f21cf16 (diff)
downloadQt-bc3abd32ed1c5a872d7a7817c1af0a13f442d536.zip
Qt-bc3abd32ed1c5a872d7a7817c1af0a13f442d536.tar.gz
Qt-bc3abd32ed1c5a872d7a7817c1af0a13f442d536.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Diffstat (limited to 'tests/auto/qwidget')
-rw-r--r--tests/auto/qwidget/tst_qwidget.cpp18
1 files changed, 0 insertions, 18 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 3fad366..041aa7a 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -351,7 +351,6 @@ private slots:
void toplevelLineEditFocus();
void focusWidget_task254563();
- void focusWidget_mixed_widget_hierarchy();
private:
bool ensureScreenSize(int width, int height);
@@ -8995,22 +8994,5 @@ void tst_QWidget::focusWidget_task254563()
QVERIFY(top.focusWidget() != widget); //dangling pointer
}
-void tst_QWidget::focusWidget_mixed_widget_hierarchy()
-{
- QWidget top;
- top.show();
- QWidget notvisible(&top);
- QWidget *visible = new QWidget(&notvisible);
- visible->show();
-
- visible->setFocus();
- notvisible.setFocus();
- notvisible.show();
- QCOMPARE(top.focusWidget(), visible);
- QCOMPARE(notvisible.focusWidget(), visible);
- QCOMPARE(visible->focusWidget(), visible);
-}
-
-
QTEST_MAIN(tst_QWidget)
#include "tst_qwidget.moc"