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
..
kernel	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-11 18:10:41 +01:00
models	Test calling setRelation() with QSqlRelation() clears the relation	2018-01-02 08:50:54 +00:00
sql.pro