qt5base-lts/tests/auto/gui/qopengl
Allan Sandfeld Jensen fa9d12f4a2 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	src/plugins/platforms/windows/qwindowsmousehandler.cpp
	src/plugins/platforms/xcb/qxcbimage.cpp
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/manual/qtabletevent/regular_widgets/main.cpp

Done-with: Friedemann Kleint<Friedemann.Kleint@qt.io>
Done-with: Mårten Nordheim<marten.nordheim@qt.io>
Change-Id: I5b2499513a92c590ed0756f7d2e93c35a64b7f30
2017-10-24 13:40:55 +02:00
..
BLACKLIST Fix blacklisting of tst_QOpenGL in Windows 2017-10-10 07:42:33 +00:00
qopengl.pro Fix building of qopengl test on boot2qt 2017-03-29 12:29:50 +00:00
tst_qopengl.cpp Merge remote-tracking branch 'origin/5.10' into dev 2017-10-17 10:34:24 +02:00