diff options
| -rw-r--r-- | tests/auto/qgraphicseffect/qgraphicseffect.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp | 22 |
2 files changed, 22 insertions, 2 deletions
diff --git a/tests/auto/qgraphicseffect/qgraphicseffect.pro b/tests/auto/qgraphicseffect/qgraphicseffect.pro index f35809c..9e734fb 100644 --- a/tests/auto/qgraphicseffect/qgraphicseffect.pro +++ b/tests/auto/qgraphicseffect/qgraphicseffect.pro @@ -4,5 +4,3 @@ TARGET = tst_qgraphicseffect QT += testlib SOURCES += tst_qgraphicseffect.cpp CONFIG += parallel_test - -CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp index 6f5d471..5ee945e 100644 --- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp +++ b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp @@ -53,6 +53,8 @@ #include <private/qgraphicseffect_p.h> #include "../platformquirks.h" +#include <QSysInfo> + //TESTED_CLASS= //TESTED_FILES= @@ -690,6 +692,11 @@ void tst_QGraphicsEffect::childrenVisibilityShouldInvalidateCache() view.show(); QApplication::setActiveWindow(&view); QTest::qWaitForWindowShown(&view); +#ifdef Q_OS_MAC + if (QSysInfo::MacintoshVersion == QSysInfo::MV_LION) { + QEXPECT_FAIL("", "QTBUG-26858", Abort); + } +#endif QTRY_COMPARE(parent.nbPaint, 1); //we set an effect on the parent parent.setGraphicsEffect(new QGraphicsDropShadowEffect(&parent)); @@ -718,6 +725,11 @@ void tst_QGraphicsEffect::prepareGeometryChangeInvalidateCache() else view.show(); QTest::qWaitForWindowShown(&view); +#ifdef Q_OS_MAC + if (QSysInfo::MacintoshVersion == QSysInfo::MV_LION) { + QEXPECT_FAIL("", "QTBUG-26858", Abort); + } +#endif QTRY_COMPARE(item->nbPaint, 1); item->nbPaint = 0; @@ -802,6 +814,11 @@ void tst_QGraphicsEffect::graphicsEffectUpdateShouldInvalidateParentGraphicsEffe QTest::qWaitForWindowShown(&view); //flush the events QApplication::processEvents(); +#ifdef Q_OS_MAC + if (QSysInfo::MacintoshVersion == QSysInfo::MV_LION) { + QEXPECT_FAIL("", "QTBUG-26858", Abort); + } +#endif QTRY_COMPARE(parent.nbPaint, 1); QTRY_COMPARE(child.nbPaint, 1); @@ -842,6 +859,11 @@ void tst_QGraphicsEffect::itemHasNoContents() QGraphicsView view(&scene); view.show(); QTest::qWaitForWindowShown(&view); +#ifdef Q_OS_MAC + if (QSysInfo::MacintoshVersion == QSysInfo::MV_LION) { + QEXPECT_FAIL("", "QTBUG-26858", Abort); + } +#endif QTRY_COMPARE(child->nbPaint, 1); CustomEffect *effect = new CustomEffect; |