Liang Qi 6cb8121a44 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/widgets/styles/qgtkstyle_p.cpp tests/auto/corelib/io/qtextstream/test/test.pro tests/auto/corelib/plugin/plugin.pro Change-Id: I512bc1b36acf3933ed2b96c00f476ee3819c1f4b		2016-03-21 09:02:57 +01:00
..
qfactoryloader	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-02 15:57:44 +01:00
qlibrary	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-02 15:57:44 +01:00
qplugin	Updated license headers	2016-01-21 18:55:18 +00:00
qpluginloader	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-02 15:57:44 +01:00
quuid	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-02 15:57:44 +01:00
plugin.pro	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-21 09:02:57 +01:00