Liang Qi aadfe7d634 Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: src/gui/kernel/qguiapplication.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h src/plugins/platforms/cocoa/qcocoawindow.h src/testlib/qtestsystem.h Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5		2017-09-26 16:14:54 +02:00
..
BLACKLIST	Blacklist tst_QOpenGL autotest in Windows 7	2017-09-12 07:15:25 +00:00
qopengl.pro	Fix building of qopengl test on boot2qt	2017-03-29 12:29:50 +00:00
tst_qopengl.cpp	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00