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
..
qcalendar	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
qdate	Merge remote-tracking branch 'origin/wip/cmake' into dev	2020-02-13 23:29:51 +01:00
qdatetime	Merge remote-tracking branch 'origin/wip/cmake' into dev	2020-02-13 23:29:51 +01:00
qtime	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
qtimezone	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
CMakeLists.txt	Regenerate qtbase after wip/qt6 -> wip/cmake merge	2019-10-14 08:49:24 +00:00
time.pro	Add support for calendars beside Gregorian	2019-08-20 13:41:21 +02:00