Liang Qi 093290a662 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/plugins/platforms/ios/quiview.mm Change-Id: I0fd0adeca1590fffddd577873172f6d987a60412		2018-04-11 09:34:23 +02:00
..
android
bic/data	Add binary compatibility files for QtBase for 5.10	2018-01-04 16:26:32 +00:00
cmake	Remove CMake code for CMake < 3.1	2018-03-24 22:31:18 +00:00
compilerwarnings/data
concurrent	Merge remote-tracking branch 'origin/5.11' into dev	2018-02-16 08:54:58 +01:00
corelib	Merge remote-tracking branch 'origin/5.11' into dev	2018-04-11 09:34:23 +02:00
dbus	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
gui	Merge remote-tracking branch 'origin/5.11' into dev	2018-04-11 09:34:23 +02:00
guiapplauncher
installed_cmake
network	Revert "tst_QSslSocket::signatureAlgorithm - fix for OpenSSL 1.1"	2018-04-10 13:17:02 +00:00
opengl	Remove tst_QGLThreads::textureUploadInThread	2018-03-02 07:20:32 +00:00
other	Merge remote-tracking branch 'origin/5.11' into dev	2018-04-10 01:00:26 +02:00
printsupport	Merge remote-tracking branch 'origin/5.11' into dev	2018-04-10 01:00:26 +02:00
shared
sql	oci: Use OCIBindByPos2 to accommodate data longer than USHRT_MAX	2018-04-06 12:44:37 +00:00
testlib	testlib: Ignore line locations from TAP reporter when running selftests	2018-03-27 19:34:04 +00:00
tools	qmake: make VFS aware of exact vs. cumulative evaluation	2018-03-29 18:15:10 +00:00
widgets	Merge remote-tracking branch 'origin/5.11' into dev	2018-04-11 09:34:23 +02:00
xml	Don't indefinitely wait for data if it was able to read some data	2018-01-24 05:54:31 +00:00
auto.pro	tests/auto/auto.pro: Use correct null device for DBUS check	2017-12-01 09:53:07 +00:00
network-settings.h