Liang Qi 23a36fd2bf Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/io/qprocess_win.cpp src/widgets/itemviews/qheaderview.cpp Change-Id: I0a59ade9cd6e91f770fdf298a7d72a41e79fd761		2016-04-27 09:18:05 +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	QtConcurrentRun: add unittest for polling for isFinished()	2016-02-15 13:53:57 +00:00
corelib	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-27 09:18:05 +02:00
dbus	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-02 15:57:44 +01:00
gui	Interpret fixed CSS line-height as minimum rather than absolute	2016-04-19 09:32:10 +00:00
guiapplauncher	Fix path to examples part of tst_GuiAppLauncher	2015-02-13 07:28:15 +00:00
installed_cmake	Add a unit test for testing Qt in its install location.	2013-07-02 23:08:54 +02:00
network	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-27 09:18:05 +02:00
opengl	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-04 08:59:18 +02:00
other	Blacklisting autotests that fail on RHEL 7.1 also on RHEL 7.2	2016-04-15 05:57:02 +00: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-03-21 09:02:57 +01:00
testlib	QtTest/generate_expected_output.py: Add TeamCity logging format.	2016-03-17 17:29:14 +00:00
tools	make extra compiler targets depend on their respective compiler	2016-04-18 09:38:10 +00:00
widgets	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-27 09:18:05 +02: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-04-07 10:47:20 +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