Liang Qi f4d8cafc1b Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: src/3rdparty/harfbuzz-ng/src/hb-private.hh src/sql/doc/snippets/code/doc_src_sql-driver.cpp src/sql/doc/src/sql-driver.qdoc Change-Id: I38f0e82fcd37926cbf3c1915e009a731040d4598		2018-01-11 18:10:41 +01:00
..
android	Updated license headers	2016-01-21 18:55:18 +00:00
bic/data	Add binary compatibility files for QtBase for 5.10	2018-01-04 16:26:32 +00:00
cmake	CMake: Set SKIP_AUTOMOC/AUTOUIC where needed	2017-11-22 13:51:30 +00:00
compilerwarnings/data	Updated license headers	2016-01-21 18:55:18 +00:00
concurrent	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
corelib	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-11 18:10:41 +01:00
dbus	Use dependencies instead of CONFIG+=ordered	2017-12-02 11:09:15 +00:00
gui	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-11 18:10:41 +01:00
guiapplauncher	…
installed_cmake	…
network	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-11 18:10:41 +01:00
opengl	Change almost all other uses of qrand() to QRandomGenerator	2017-11-08 09:14:03 +00:00
other	QAbstractItemModelTester: fix the autotests	2018-01-09 21:12:58 +00:00
printsupport	Convert features.completer to QT_[REQUIRE_]CONFIG	2017-09-04 11:28:02 +00:00
shared	Remove workaround for potentially unavailable pasteboard in macOS	2017-03-07 01:04:46 +00:00
sql	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-11 18:10:41 +01:00
testlib	QAbstractItemModelTester: fix the autotests	2018-01-09 21:12:58 +00:00
tools	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-11 18:10:41 +01:00
widgets	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-11 18:10:41 +01:00
xml	tst_qxmlsimplereader::inputFromSocket - fix race condition(s)	2017-11-06 19:14:41 +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	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00