diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-02 13:41:31 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-02 13:41:58 +0100 |
| commit | 1ba68c8431d746b46bba1a0f117f3ff7cd2c6aea (patch) | |
| tree | 462bcde5696636851216be3ae33fb474a7cb2f6c /tests | |
| parent | c170ea57ca5a927b22726a730a7eedd274abbcfc (diff) | |
| parent | d40fcf19f7768e6ae80532ff3d8a416132594f87 (diff) | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I89bbb2977350a03c156d531f810d08a5560ffbb3
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index a25ed9bf9c..7c94cf6d17 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -1209,6 +1209,11 @@ void tst_qquickwindow::headless() QVERIFY(window->openglContext() == 0); } + if (QGuiApplication::platformName() == QLatin1String("windows") + && QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES) { + QSKIP("Crashes on Windows/ANGLE, QTBUG-42967"); + } + // Destroy the native windowing system buffers window->destroy(); QVERIFY(window->handle() == 0); |