diff options
| -rw-r--r-- | tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index d71cb31..e19bb5a 100644 --- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -992,7 +992,13 @@ void tst_QGraphicsProxyWidget::hoverEnterLeaveEvent() QTest::mouseMove(&view, QPoint(50, 50)); QTRY_COMPARE(widget->testAttribute(Qt::WA_UnderMouse), hasWidget ? true : false); // ### this attribute isn't supported - QCOMPARE(widget->enterCount, hasWidget ? 1 : 0); + int widgetEnterCount = widget->enterCount; + int hasWidgetZeroOne = hasWidget ? 1 : 0; +#if defined(Q_OS_LINUX) && defined(QT_BUILD_INTERNAL) + if (widgetEnterCount != hasWidgetZeroOne) + QEXPECT_FAIL("", "QTBUG-27885", Continue); +#endif + QCOMPARE(widgetEnterCount, hasWidgetZeroOne); QCOMPARE(widget->hoverEnter, (hasWidget && hoverEnabled) ? 1 : 0); // does not work on all platforms //QCOMPARE(widget->moveCount, 0); @@ -2734,6 +2740,7 @@ void tst_QGraphicsProxyWidget::childPos() } QVERIFY(proxyChild); QVERIFY(proxyChild->isVisible()); + qreal proxyChildPosX = proxyChild->pos().x(); qreal expectedXPosition = 0.0; #if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC) // The Mac style wants the popup to show up at QPoint(4 - 11, 1). @@ -2741,7 +2748,11 @@ void tst_QGraphicsProxyWidget::childPos() if (qobject_cast<QMacStyle *>(QApplication::style())) expectedXPosition = qreal(4 - 11); #endif - QCOMPARE(proxyChild->pos().x(), expectedXPosition); +#if defined(Q_OS_LINUX) && defined(QT_BUILD_INTERNAL) + if (proxyChildPosX != expectedXPosition) + QEXPECT_FAIL("", "QTBUG-27885", Continue); +#endif + QCOMPARE(proxyChildPosX, expectedXPosition); menu->hide(); } } @@ -3065,7 +3076,12 @@ void tst_QGraphicsProxyWidget::createProxyForChildWidget() QTRY_COMPARE(spy.count(), 0); QTest::mouseRelease(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(checkboxProxy->mapToScene(QPointF(8,8)))); - QTRY_COMPARE(spy.count(), 1); + int spyCount = spy.count(); +#if defined(Q_OS_LINUX) && defined(QT_BUILD_INTERNAL) + if (spyCount != 1) + QEXPECT_FAIL("", "QTBUG-27885", Continue); +#endif + QTRY_COMPARE(spyCount, 1); @@ -3387,12 +3403,11 @@ void tst_QGraphicsProxyWidget::updateAndDelete() // Update and hide. proxy->update(); proxy->hide(); -#ifdef Q_OS_MAC - if (QSysInfo::MacintoshVersion >= QSysInfo::MV_LION) { + int viewNPaints = view.npaints; + // unstable on all platforms + if (viewNPaints != 1) QEXPECT_FAIL("", "QTBUG-26801", Abort); - } -#endif - QTRY_COMPARE(view.npaints, 1); + QTRY_COMPARE(viewNPaints, 1); QCOMPARE(view.paintEventRegion, expectedRegion); proxy->show(); |