Liang Qi 905329200f Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: src/gui/image/qpixmap.cpp src/widgets/kernel/qformlayout.cpp Change-Id: I8a8391a202adf7f18464a22ddf0a6c4974eab692		2016-10-11 07:40:32 +02:00
..
android	Updated license headers	2016-01-21 18:55:18 +00:00
bic/data	BIC data files for QtBase for Qt 5.7	2016-10-03 09:38:59 +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	tst_QSettings: Don't assume the presence of a key means isWritable	2016-10-10 16:06:43 +00:00
dbus	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
gui	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-11 07:40:32 +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.7' into 5.8	2016-10-06 20:12:27 +02:00
opengl	winrt: Add tests to blacklist	2016-09-07 04:54:28 +00:00
other	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-09-29 00:38:01 +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.7' into 5.8	2016-09-21 11:57:52 +02:00
testlib	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-09-21 11:57:52 +02:00
tools	remove unnecessary references to $$QMAKE_CFLAGS_DBUS	2016-10-04 20:21:28 +00:00
widgets	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-11 07:40:32 +02:00
xml	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-09-29 00:38:01 +02:00
auto.pro	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
network-settings.h	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00
test.pl	Updated license headers	2016-01-21 18:55:18 +00:00