diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2012-10-16 16:53:09 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-18 15:19:48 +0200 |
| commit | 92e4ec7a146660362f365d8a54e0f017c8f48bd9 (patch) | |
| tree | 77414ee60a8064a17cfbe92b76b4be8ffc8897c3 /tests/auto/other | |
| parent | e75be9f30e88f0bef361144887fb36a30079cb7d (diff) | |
Bring back Mac dependent code in QBoxLayout, QGridLayout
We also made an accessibility auto-test more stable, so that it would
not be influenced by this patch.
Task-number: QTCREATORBUG-7966
Change-Id: I6ce4e2361c8847aee5dd1cf5664c29cd2d83e38d
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index 08d679772e..9d614703c6 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -1680,6 +1680,7 @@ void tst_QAccessibility::mdiSubWindowTest() const int subWindowCount = 5; for (int i = 0; i < subWindowCount; ++i) { QMdiSubWindow *window = mdiArea.addSubWindow(new QPushButton("QAccessibilityTest")); + window->setAttribute(Qt::WA_LayoutUsesWidgetRect); window->show(); // Parts of this test requires that the sub windows are placed next // to each other. In order to achieve that QMdiArea must have @@ -1759,7 +1760,7 @@ void tst_QAccessibility::mdiSubWindowTest() const QPoint globalWidgetPos = QPoint(globalPos.x() + widgetGeometry.x(), globalPos.y() + widgetGeometry.y()); #ifdef Q_OS_MAC - QEXPECT_FAIL("", "QTBUG-22812", Abort); + QSKIP("QTBUG-22812"); #endif QCOMPARE(childRect(interface), QRect(globalWidgetPos, widgetGeometry.size())); |