qt6-bb10/tests/auto
Liang Qi 3e949b75fd Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	mkspecs/features/mac/default_pre.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	qtbase.pro

Change-Id: I65b5ebca4942a4f295bdd4ac1568e5c347333aea
2016-10-01 22:15:55 +02:00
..
android Updated license headers 2016-01-21 18:55:18 +00:00
bic/data Data files for binary compatibility tests updated for Qt 5.6 2016-09-30 10:55: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 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-28 11:51:35 +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-10-01 22:15:55 +02:00
guiapplauncher
installed_cmake
network Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-28 11:51:35 +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-28 11:51:35 +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-09-16 23:16:25 +02:00
testlib Blacklist selftest runSubTest 2016-09-12 12:59:48 +00:00
tools Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-05 13:57:12 +02:00
widgets Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-01 22:15:55 +02:00
xml Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-23 22:28:33 +02: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