Liang Qi bc07958f92 Merge remote-tracking branch 'origin/5.11' into 5.12 ... Conflicts: .qmake.conf qmake/Makefile.unix src/gui/text/qtextdocument.cpp src/gui/text/qtextdocument.h Change-Id: Iba26da0ecbf2aa4ff4b956391cfb373f977f88c9		2018-11-09 10:34:33 +01:00
..
doc	Merge remote-tracking branch 'origin/5.11' into 5.12	2018-09-07 01:00:21 +02:00
dom	Modernize the "textcodec" feature	2018-11-07 13:19:54 +00:00
sax	Modernize the "textcodec" feature	2018-11-07 13:19:54 +00:00
configure.json	Convert the old feature system	2016-09-15 08:24:10 +00:00
qtxmlglobal.h	Convert the old feature system	2016-09-15 08:24:10 +00:00
xml.pro	MSVC: Don't set a DLL base address for 64-bit	2018-01-24 21:20:47 +00:00