Liang Qi 28628a5d5e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/plugins/platforms/eglfs/qeglfshooks.cpp Change-Id: I483f0dbd876943b184803f0fe65a0c686ad75db2		2016-10-22 21:19:57 +02:00
..
.gitignore	…
qformlayout.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qformlayout.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-22 21:19:57 +02:00