Alexandru Croitor c53ee1f054 Merge remote-tracking branch 'origin/wip/cmake' into dev ... Conflicts: tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt Hopefully final merge from wip/cmake, and then all cmake changes should target dev directly. Change-Id: I29b04c9b0284e97334877c77a32ffdf887dbf95b		2020-02-13 23:29:51 +01:00
..
image	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
itemmodels	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
kernel	Merge remote-tracking branch 'origin/wip/cmake' into dev	2020-02-13 23:29:51 +01:00
math3d	Merge remote-tracking branch 'origin/dev' into wip/cmake	2020-01-29 16:57:27 +01:00
painting	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
qopengl	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qopenglconfig	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qvulkan	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
rhi	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
text	Merge remote-tracking branch 'origin/wip/cmake' into dev	2020-02-13 23:29:51 +01:00
util	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
.prev_CMakeLists.txt	Regenerate some of the test projects that do SUBDIRS += foo	2019-08-07 11:55:38 +00:00
CMakeLists.txt	cmake: add tests/auto/gui/text	2019-11-01 13:28:59 +00:00
gui.pro	Introduce the Qt graphics abstraction as private QtGui helpers	2019-06-13 10:13:45 +02:00