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
..
qabstracttextdocumentlayout	Remove insignificant from qabstracttextdocumentlayout test	2016-01-22 09:13:27 +00:00
qcssparser	Updated license headers	2016-01-21 18:55:18 +00:00
qfont	Updated license headers	2016-01-21 18:55:18 +00:00
qfontcache	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-02 15:57:44 +01:00
qfontdatabase	Updated license headers	2016-01-21 18:55:18 +00:00
qfontmetrics	Updated license headers	2016-01-21 18:55:18 +00:00
qglyphrun	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-18 20:50:35 +01:00
qrawfont	Updated license headers	2016-01-21 18:55:18 +00:00
qstatictext	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-21 09:02:57 +01:00
qsyntaxhighlighter	Updated license headers	2016-01-21 18:55:18 +00:00
qtextblock	Updated license headers	2016-01-21 18:55:18 +00:00
qtextcursor	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
qtextdocument	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
qtextdocumentfragment	Updated license headers	2016-01-21 18:55:18 +00:00
qtextdocumentlayout	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
qtextformat	Updated license headers	2016-01-21 18:55:18 +00:00
qtextlayout	Updated license headers	2016-01-21 18:55:18 +00:00
qtextlist	Updated license headers	2016-01-21 18:55:18 +00:00
qtextobject	Updated license headers	2016-01-21 18:55:18 +00:00
qtextodfwriter	Updated license headers	2016-01-21 18:55:18 +00:00
qtextpiecetable	Updated license headers	2016-01-21 18:55:18 +00:00
qtextscriptengine	Updated license headers	2016-01-21 18:55:18 +00:00
qtexttable	Updated license headers	2016-01-21 18:55:18 +00:00
qzip	Updated license headers	2016-01-21 18:55:18 +00:00
text.pro	Enable most of tst_qstatictext on non-developer builds	2016-03-10 15:45:41 +00:00