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
..
json	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qcborstreamreader	cmake: add tests in corelib/serialization	2019-10-07 08:57:31 +00:00
qcborstreamwriter	cmake: add tests in corelib/serialization	2019-10-07 08:57:31 +00:00
qcborvalue	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
qcborvalue_json	Merge remote-tracking branch 'origin/dev' into wip/cmake	2019-11-19 13:53:21 +01:00
qdatastream	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
qdatastream_core_pixmap	Merge remote-tracking branch 'origin/dev' into wip/cmake	2019-11-19 13:53:21 +01:00
qtextstream	Merge remote-tracking branch 'origin/wip/cmake' into dev	2020-02-03 15:01:53 +00:00
qxmlstream	Merge remote-tracking branch 'origin/dev' into wip/cmake	2020-01-29 16:57:27 +01:00
CMakeLists.txt	cmake: add tests in corelib/serialization	2019-10-07 08:57:31 +00:00
serialization.pro	Exclude tests that need GUI when GUI isn't available	2019-10-25 11:42:09 +02:00