diff options
author | David Boddie <dboddie@trolltech.com> | 2010-06-21 17:02:54 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-06-21 17:02:54 (GMT) |
commit | 84ce7cc25b925d493a048ce5b00290483cd974f4 (patch) | |
tree | 0f4e709ca90e9bf3e683668460734282f426089d /tests/auto/qwidget | |
parent | a2a5a8c5e203fe9d55f9addba1533a30c6f2ba19 (diff) | |
parent | 32e532743dc6243612ade017e8c326ca0e7e0dec (diff) | |
download | Qt-84ce7cc25b925d493a048ce5b00290483cd974f4.zip Qt-84ce7cc25b925d493a048ce5b00290483cd974f4.tar.gz Qt-84ce7cc25b925d493a048ce5b00290483cd974f4.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'tests/auto/qwidget')
-rw-r--r-- | tests/auto/qwidget/tst_qwidget.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index d76bbfa..045216a 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -610,10 +610,14 @@ void tst_QWidget::getSetCheck() obj1.setAttribute(Qt::WA_InputMethodEnabled); obj1.setInputContext(var13); QCOMPARE(static_cast<QInputContext *>(var13), obj1.inputContext()); + // QWidget takes ownership, so check parent + QCOMPARE(var13->parent(), static_cast<QObject *>(&obj1)); + // Check self assignment + obj1.setInputContext(obj1.inputContext()); + QCOMPARE(static_cast<QInputContext *>(var13), obj1.inputContext()); obj1.setInputContext((QInputContext *)0); QCOMPARE(qApp->inputContext(), obj1.inputContext()); QVERIFY(qApp->inputContext() != var13); - //delete var13; // No delete, since QWidget takes ownership // bool QWidget::autoFillBackground() // void QWidget::setAutoFillBackground(bool) |