Liang Qi 4783de0473 Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: src/network/socket/qnativesocketengine_winrt.cpp tools/configure/configureapp.cpp tools/configure/environment.cpp Change-Id: Ieae6f2ee004a87f041751852b687484f91ee4480		2016-11-24 10:31:21 +01:00
..
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qformlayout.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qformlayout.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-24 10:31:21 +01:00