diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-05 15:31:08 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 10:11:04 +0200 |
| commit | af44559780765c7121a49c2e0764cf24e740312d (patch) | |
| tree | a4f2f50ddfe969f33a4d4accd392523c6809fd5a /tests/auto/quick/qquickitem | |
| parent | 8784a4a46ea1357bde546c9a1c88bd060e863f30 (diff) | |
| parent | b30d7c9ee8fbc3a395c74b618f2ab176ae1e7f7e (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/qml/debugger/qv8debugservice.cpp
src/qml/qml/v8/qv8engine.cpp
tests/auto/quick/qquickitem/qquickitem.pro
Change-Id: Ic4a1dcdd8b8a84155d2f2abefdf1da5c3a56af31
Diffstat (limited to 'tests/auto/quick/qquickitem')
| -rw-r--r-- | tests/auto/quick/qquickitem/tst_qquickitem.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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); |