Simon Hausmann e281537f20 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/qglobal.h src/platformsupport/platformcompositor/qopenglcompositor.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I5422868500be695584a496dbbbc719d146bc572d		2014-12-18 12:12:58 +01:00
..
qabstracttextdocumentlayout	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qcssparser	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qfont	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qfontcache	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qfontdatabase	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qfontmetrics	Fix regression in metric calculation of text with mnemonics	2014-10-01 15:30:43 +02:00
qglyphrun	QStyleSheetStyle: Don't interfere with QFontDialog	2014-10-24 16:59:26 +02:00
qrawfont	QStyleSheetStyle: Don't interfere with QFontDialog	2014-10-24 16:59:26 +02:00
qstatictext	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qsyntaxhighlighter	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qtextblock	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qtextcursor	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qtextdocument	Merge remote-tracking branch 'origin/5.4' into dev	2014-09-29 14:08:49 +02:00
qtextdocumentfragment	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qtextdocumentlayout	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qtextformat	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qtextlayout	Fix possibly corrupted log clusters when using custom tab stops	2014-12-15 21:02:12 +01:00
qtextlist	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qtextobject	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qtextodfwriter	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qtextpiecetable	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qtextscriptengine	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qtexttable	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qzip	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
text.pro	Fix the font engines leaking	2013-03-20 07:02:29 +01:00