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
..
moc	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-26 10:43:29 +02:00
qdbuscpp2xml	Updated license headers	2016-01-21 18:55:18 +00:00
qdbusxml2cpp	Updated license headers	2016-01-21 18:55:18 +00:00
qmake	make extra compiler targets depend on their respective compiler	2016-04-18 09:38:10 +00:00
qmakelib	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-15 20:47:57 +02:00
rcc	Updated license headers	2016-01-21 18:55:18 +00:00
uic	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-05 13:57:12 +02:00
tools.pro	add test for the qmake library	2015-02-25 13:54:33 +00:00