Liang Qi 657c2bfbec Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: tests/auto/testlib/selftests/generate_expected_output.py Change-Id: If856162abf9a24ae2c9946d336a7d1da03520fa7		2016-09-05 13:57:12 +02:00
..
baseline	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-05 13:57:12 +02:00
.gitignore
tst_uic.cpp	uic: Accept an -idbased argument	2016-01-28 14:07:43 +00:00
uic.pro	uic-Autotest: Remove SRCDIR-define, add stdout-test.	2012-08-02 20:38:54 +02:00