688f70634c
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 |
||
---|---|---|
.. | ||
.gitignore | ||
BLACKLIST | ||
qgl.pro | ||
qgl.qrc | ||
tst_qgl.cpp |