diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-08-08 13:09:52 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-08 22:57:25 (GMT) |
| commit | fe77cabec769b49d0fe61d50d6802fa20d78d366 (patch) | |
| tree | 88e9138682f24ed40a27c656246b75a529fabe2e | |
| parent | 1f1ebc29551fe24295ad07307f1a61f98feb0bc1 (diff) | |
| download | Qt-fe77cabec769b49d0fe61d50d6802fa20d78d366.zip Qt-fe77cabec769b49d0fe61d50d6802fa20d78d366.tar.gz Qt-fe77cabec769b49d0fe61d50d6802fa20d78d366.tar.bz2 | |
tests: Re-enable tst_QGraphicsProxyWidget test.
The test has one stable failure. Mark this with QEXPECT_FAIL and
re-enable the test.
Change-Id: I2e536f1b40a1d36ab593d724ee5f9ce66ce87495
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro b/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro index 317665f..f1a6d6a 100644 --- a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro +++ b/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro @@ -1,4 +1,2 @@ load(qttest_p4) SOURCES += tst_qgraphicsproxywidget.cpp - -CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 8265e3e..bb4f3ab 100644 --- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -51,6 +51,7 @@ #ifdef Q_WS_X11 #include <private/qt_x11_p.h> #endif +#include <QSysInfo> static void sendMouseMove(QWidget *widget, const QPoint &point, Qt::MouseButton button = Qt::NoButton) { @@ -3386,6 +3387,11 @@ void tst_QGraphicsProxyWidget::updateAndDelete() // Update and hide. proxy->update(); proxy->hide(); +#ifdef Q_OS_MAC + if (QSysInfo::MacintoshVersion == QSysInfo::MV_LION) { + QEXPECT_FAIL("", "QTBUG-26801", Abort); + } +#endif QTRY_COMPARE(view.npaints, 1); QCOMPARE(view.paintEventRegion, expectedRegion); |