qt5base-lts/tests/auto/gui/rhi/qrhi
Qt Forward Merge Bot 75c0ffaf6d Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	examples/network/bearermonitor/CMakeLists.txt
	examples/network/CMakeLists.txt
	src/corelib/tools/qlinkedlist.h
	src/sql/kernel/qsqldriver_p.h
	src/sql/kernel/qsqlresult_p.h
	src/widgets/kernel/qwidget.cpp
	src/widgets/kernel/qwidget_p.h
	tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json

Change-Id: I21a3c34570ae79ea9d30107fae71759d7eac17d9
2020-02-26 18:39:21 +01:00
..
data Regenerate qsb files for auto and manual tests 2020-01-22 22:47:04 +01:00
CMakeLists.txt Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
qrhi.pro Introduce the Qt graphics abstraction as private QtGui helpers 2019-06-13 10:13:45 +02:00
qrhi.qrc Introduce the Qt graphics abstraction as private QtGui helpers 2019-06-13 10:13:45 +02:00
tst_qrhi.cpp rhi: Allow querying the native buffer objects behind a QRhiBuffer 2020-02-21 09:15:18 +01:00