diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-02 05:59:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-02 06:01:25 +0200 |
| commit | 688f70634cfe18fd215a958ef339e883aef5d4a3 (patch) | |
| tree | d17d5f2fdb65f8a0bff241274d543ccbe57f7bcc /tests | |
| parent | bbb440bab261fecc7c9baf779dadf36659d3cf6f (diff) | |
| parent | 540978288ea0f6ed0b166bb9207f427a4c825ab6 (diff) | |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
This merge also blacklists a flaky tst_QGL::clipTest test on
OpenSUSE 13.1.
Conflicts:
src/network/socket/qnativesocketengine_winrt.cpp
tests/auto/opengl/qgl/BLACKLIST
Task-number: QTBUG-53133
Change-Id: I14b431aa5a189b7dd1d3e2dfff767d15df20fde3
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/opengl/qgl/BLACKLIST | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/opengl/qgl/BLACKLIST b/tests/auto/opengl/qgl/BLACKLIST index fa7c829b30..a7aaa04900 100644 --- a/tests/auto/opengl/qgl/BLACKLIST +++ b/tests/auto/opengl/qgl/BLACKLIST @@ -10,6 +10,7 @@ windows windows [clipTest] windows +opensuse-13.1 [graphicsViewClipping] windows [glFBOUseInGLWidget] |