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
..
android	Updated license headers	2016-01-21 18:55:18 +00:00
bic/data	bic: Add 5.{1,2,3,4}.0 bic data for linux-gcc-amd64	2015-02-14 06:54:20 +00:00
cmake	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-04 08:59:18 +02:00
compilerwarnings/data	Updated license headers	2016-01-21 18:55:18 +00:00
concurrent	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-25 16:12:11 +02:00
corelib	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-05 13:57:12 +02:00
dbus	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-10 23:27:10 +02:00
gui	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-29 08:13:40 +02:00
guiapplauncher	Fix path to examples part of tst_GuiAppLauncher	2015-02-13 07:28:15 +00:00
installed_cmake	…
network	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
opengl	Merge remote-tracking branch 'origin/5.6.1' into 5.6	2016-06-02 06:01:25 +02:00
other	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-05 13:57:12 +02:00
printsupport	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-29 12:34:31 +01:00
shared	Updated license headers	2016-01-21 18:55:18 +00:00
sql	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-20 08:00:26 +02:00
testlib	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-05 13:57:12 +02:00
tools	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-05 13:57:12 +02:00
widgets	Run tst_QFiledialog::widgetlessNativeDialog() last	2016-09-04 14:18:22 +00:00
xml	Updated license headers	2016-01-21 18:55:18 +00:00
auto.pro	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-04 08:59:18 +02:00
network-settings.h	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00
qtest-config.h	Updated license headers	2016-01-21 18:55:18 +00:00
test.pl	Updated license headers	2016-01-21 18:55:18 +00:00