diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-03 15:24:27 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-03 20:59:36 +0200 |
| commit | 6136bfffcec66e05235d5a07691175dddbd7a6de (patch) | |
| tree | d48f7afcf1e7c7857ce748feb2b2d96483a0b7df /tests/auto | |
| parent | c9c3875fd091602c5470cd45a995dbb329d8cf3d (diff) | |
Fix QWidget/widgetAt() test.
Prevent a crash by giving the widget some time to show up.
Task-number: QTBUG-22326
Change-Id: Idaa23b21121e7c4f7098e8d51efd313bcc467e9a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 36567b0ac2..ffbe39e5d5 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -3125,11 +3125,13 @@ void tst_QWidget::widgetAt() #if defined(Q_OS_WINCE) QEXPECT_FAIL("", "Windows CE does only support rectangular regions", Continue); //See also task 147191 #endif - /// ### fixme: Check platforms - QEXPECT_FAIL("", "Window mask not implemented on Lighthouse QTBUG-22326", Continue); + if (!QGuiApplication::platformName().compare(QLatin1String("cocoa"), Qt::CaseInsensitive)) + QEXPECT_FAIL("", "Window mask not implemented on Mac QTBUG-22326", Continue); - QTRY_COMPARE(QApplication::widgetAt(100,100)->objectName(), w1->objectName()); - QTRY_COMPARE(QApplication::widgetAt(101,101)->objectName(), w2->objectName()); + QTRY_VERIFY((wr = QApplication::widgetAt(100,100))); + QTRY_COMPARE(wr->objectName(), w1->objectName()); + QTRY_VERIFY((wr = QApplication::widgetAt(101,101))); + QTRY_COMPARE(wr->objectName(), w2->objectName()); QBitmap bitmap(w2->size()); QPainter p(&bitmap); @@ -3143,8 +3145,8 @@ void tst_QWidget::widgetAt() #if defined(Q_OS_WINCE) QEXPECT_FAIL("", "Windows CE does only support rectangular regions", Continue); //See also task 147191 #endif - /// ### fixme: Check platforms - QEXPECT_FAIL("", "Window mask not implemented on Lighthouse QTBUG-22326", Continue); + if (!QGuiApplication::platformName().compare(QLatin1String("cocoa"), Qt::CaseInsensitive)) + QEXPECT_FAIL("", "Window mask not implemented on Mac QTBUG-22326", Continue); QTRY_VERIFY(QApplication::widgetAt(100,100) == w1); QTRY_VERIFY(QApplication::widgetAt(101,101) == w2); |