diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-02 08:48:52 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-02 08:48:52 (GMT) |
| commit | c006edf9b186c4a8a56e888e8f5d1b692e29f1d8 (patch) | |
| tree | e105f4e2389cd17a5392478160d37230f4118960 /tests/auto/qitemdelegate | |
| parent | fd5e86e65adfdecd7bf8a49764d9c9410d877e44 (diff) | |
| parent | 2d003378ff5e7621d5dcc810408039cfe13a8c0a (diff) | |
| download | Qt-c006edf9b186c4a8a56e888e8f5d1b692e29f1d8.zip Qt-c006edf9b186c4a8a56e888e8f5d1b692e29f1d8.tar.gz Qt-c006edf9b186c4a8a56e888e8f5d1b692e29f1d8.tar.bz2 | |
Merge commit 'qt/4.6' into mmfphonon
Conflicts:
src/gui/kernel/qwidget_s60.cpp
Diffstat (limited to 'tests/auto/qitemdelegate')
| -rw-r--r-- | tests/auto/qitemdelegate/tst_qitemdelegate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp index 5d1034a..426887d 100644 --- a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp @@ -865,7 +865,7 @@ void tst_QItemDelegate::decoration() qt_x11_wait_for_window_manager(&table); #endif QApplication::setActiveWindow(&table); - QTRY_COMPARE(QApplication::activeWindow(), &table); + QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget*>(&table)); QVariant value; switch ((QVariant::Type)type) { |