Liang Qi 9808b53fde Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: configure src/plugins/platforms/eglfs/qeglfsintegration.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b		2016-11-15 09:58:16 +01: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-11-15 09:58:16 +01: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