diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-08-22 13:56:22 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-23 06:56:30 +0200 |
| commit | adba828504c498944d244c5d17576f4542dd0c15 (patch) | |
| tree | f06395ccd86a1886b680d57aa467403c405e4740 | |
| parent | 4f35280bd039c2d2f0c53e936740440f1d887916 (diff) | |
tst_qquickitem: Make exclusion more fine-grained.
Revert 764bd1cb0f8f2db4f84018890b9ebb8b42741789 .
Task-number: QTBUG-32664
Change-Id: Idbe476a3e34b584b12e653f23a36d58028a2bf21
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| -rw-r--r-- | tests/auto/quick/qquickitem/qquickitem.pro | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquickitem/tst_qquickitem.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickitem/qquickitem.pro b/tests/auto/quick/qquickitem/qquickitem.pro index 5641ca5a6d..ea6ae8f4af 100644 --- a/tests/auto/quick/qquickitem/qquickitem.pro +++ b/tests/auto/quick/qquickitem/qquickitem.pro @@ -8,7 +8,5 @@ macx:CONFIG -= app_bundle TESTDATA = data/* -win32:CONFIG += insignificant_test # QTBUG-32664 - QT += core-private gui-private v8-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp index 79f08d5147..97e002361b 100644 --- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp @@ -1162,6 +1162,9 @@ static inline QByteArray msgItem(const QQuickItem *item) void tst_qquickitem::mouseGrab() { +#if defined(Q_OS_WIN) && defined(QT_OPENGL_ES_2) + QSKIP("Fails in the CI for ANGLE builds on Windows, QTBUG-32664"); +#endif QQuickWindow window; window.setFramePosition(QPoint(100, 100)); window.resize(200, 200); |