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
..
generate	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
CMakeLists.txt	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qtextscriptengine.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qtextscriptengine.cpp	Remove work-around from thaiWithZWJ test	2020-02-12 06:33:54 +00:00