diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-04-30 13:24:55 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-04-30 13:24:55 (GMT) |
| commit | 32493498dcf3aa1ab9973aab381c5ca99d9ba9fd (patch) | |
| tree | cb46e87a358289adbc5c58d74521676add50435e /tests/auto | |
| parent | b20ca123c521a1dae695045211c253c221ed604a (diff) | |
| parent | 4b1137345a0bbfedc348b020ad0ad6e5720eb6d1 (diff) | |
| download | Qt-32493498dcf3aa1ab9973aab381c5ca99d9ba9fd.zip Qt-32493498dcf3aa1ab9973aab381c5ca99d9ba9fd.tar.gz Qt-32493498dcf3aa1ab9973aab381c5ca99d9ba9fd.tar.bz2 | |
Merge commit 'private/translucentWindows'
Conflicts:
src/gui/styles/qs60style_symbian.cpp
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qwidget/tst_qwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index d493219..110a4e0 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -8790,8 +8790,8 @@ void tst_QWidget::toplevelLineEditFocus() #endif QTest::qWait(200); - QCOMPARE(QApplication::activeWindow(), &w); - QCOMPARE(QApplication::focusWidget(), &w); + QCOMPARE(QApplication::activeWindow(), (QWidget*)&w); + QCOMPARE(QApplication::focusWidget(), (QWidget*)&w); } QTEST_MAIN(tst_QWidget) |