diff options
| author | axis <qt-info@nokia.com> | 2009-09-30 08:27:15 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-09-30 13:31:05 (GMT) |
| commit | c3cce20dd24ee110d4a8b434ea0623fd8c07ed68 (patch) | |
| tree | 266d3805c8d66654d44351666b4893394377253a | |
| parent | a93d0d1f970689991dd113d696e922854ff9ec6a (diff) | |
| download | Qt-c3cce20dd24ee110d4a8b434ea0623fd8c07ed68.zip Qt-c3cce20dd24ee110d4a8b434ea0623fd8c07ed68.tar.gz Qt-c3cce20dd24ee110d4a8b434ea0623fd8c07ed68.tar.bz2 | |
Helped out the Symbian compiler to avoid build error.
RevBy: Trust me
| -rw-r--r-- | tests/auto/qwidget/tst_qwidget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index 3918eff..8860924 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -5500,14 +5500,14 @@ void tst_QWidget::multipleToplevelFocusCheck() w1.activateWindow(); QApplication::setActiveWindow(&w1); QApplication::processEvents(); - QTRY_COMPARE(QApplication::activeWindow(), &w1); + QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&w1)); QTest::mouseDClick(&w1, Qt::LeftButton); QTRY_COMPARE(QApplication::focusWidget(), static_cast<QWidget *>(w1.edit)); w2.activateWindow(); QApplication::setActiveWindow(&w2); QApplication::processEvents(); - QTRY_COMPARE(QApplication::activeWindow(), &w2); + QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&w2)); QTest::mouseClick(&w2, Qt::LeftButton); #ifdef Q_WS_QWS QEXPECT_FAIL("", "embedded toplevels take focus anyway", Continue); @@ -5520,14 +5520,14 @@ void tst_QWidget::multipleToplevelFocusCheck() w1.activateWindow(); QApplication::setActiveWindow(&w1); QApplication::processEvents(); - QTRY_COMPARE(QApplication::activeWindow(), &w1); + QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&w1)); QTest::mouseDClick(&w1, Qt::LeftButton); QTRY_COMPARE(QApplication::focusWidget(), static_cast<QWidget *>(w1.edit)); w2.activateWindow(); QApplication::setActiveWindow(&w2); QApplication::processEvents(); - QTRY_COMPARE(QApplication::activeWindow(), &w2); + QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&w2)); QTest::mouseClick(&w2, Qt::LeftButton); QTRY_COMPARE(QApplication::focusWidget(), (QWidget *)0); } |