diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-13 22:00:15 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-13 22:00:15 (GMT) |
| commit | 8399cce50eb11db885e67a52055505951309cae8 (patch) | |
| tree | 56518186c2835fadec353feef725328f85ba4e25 /tests/auto/qcompleter/tst_qcompleter.cpp | |
| parent | 0e4083ba5bf1bbc581d072b016fb977fb1f846c1 (diff) | |
| parent | 870ecb5b44a56b29d16a4819c2d92298801cf98f (diff) | |
| download | Qt-8399cce50eb11db885e67a52055505951309cae8.zip Qt-8399cce50eb11db885e67a52055505951309cae8.tar.gz Qt-8399cce50eb11db885e67a52055505951309cae8.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'tests/auto/qcompleter/tst_qcompleter.cpp')
| -rw-r--r-- | tests/auto/qcompleter/tst_qcompleter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/qcompleter/tst_qcompleter.cpp index a62720b..1590528 100644 --- a/tests/auto/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/qcompleter/tst_qcompleter.cpp @@ -1324,7 +1324,7 @@ void tst_QCompleter::task253125_lineEditCompletion() #endif QTest::qWait(10); QApplication::setActiveWindow(&edit); - QTRY_COMPARE(QApplication::activeWindow(), &edit); + QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&edit)); QTest::keyClick(&edit, 'i'); QCOMPARE(edit.completer()->currentCompletion(), QString("iota")); @@ -1362,7 +1362,7 @@ void tst_QCompleter::task247560_keyboardNavigation() QTest::qWait(10); QApplication::setActiveWindow(&edit); - QTRY_COMPARE(QApplication::activeWindow(), &edit); + QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&edit)); QTest::keyClick(&edit, 'r'); QTest::keyClick(edit.completer()->popup(), Qt::Key_Down); |