Liang Qi 739585b2f5 Merge remote-tracking branch 'origin/5.9' into 5.10 ... Conflicts: src/corelib/io/qprocess_win.cpp Change-Id: Ib61b74a69922ec1e9eecbba5f75352b4ec167fa9		2018-01-19 09:48:10 +01:00
..
externalsites	Doc: Update Qt Creator Manual link targets to match version 4.4	2017-08-23 12:18:14 +00:00
includes	…
includes-online	…
template	Doc: Add styling for function groups	2017-08-15 09:40:13 +00:00
compat.qdocconf	Doc: Ignore QML/JavaScript parsing errors	2017-02-07 08:34:39 +00:00
config.qdocconf	Doc: Add a comment into config.qdocconf about generating internal docs	2017-02-07 08:36:00 +00:00
externalsites.qdocconf	…
fileextensions.qdocconf	…
html-config.qdocconf	…
html-footer-online.qdocconf	Doc: Documentation template: Bump copyright year	2017-01-26 10:56:34 +00:00
html-footer.qdocconf	Doc: Documentation template: Bump copyright year	2017-01-26 10:56:34 +00:00
html-header-offline.qdocconf	…
html-header-online.qdocconf	…
macros.qdocconf	Doc: Mention exact Qt version the third party attributions apply to	2018-01-19 06:30:06 +00:00
manifest-meta.qdocconf	Doc: Remove the default list of highlighted examples	2017-11-13 08:38:51 +00:00
qt-cpp-defines.qdocconf	Merge remote-tracking branch 'origin/5.9' into dev	2017-06-19 16:12:34 +02:00
qt-html-templates-offline-simple.qdocconf	Fix jumping to anchors with offline style	2017-08-29 11:25:27 +00:00
qt-html-templates-offline.qdocconf	…
qt-html-templates-online.qdocconf	…
qt-module-defaults-offline.qdocconf	…
qt-module-defaults-online-commercial.qdocconf	…
qt-module-defaults-online.qdocconf	Doc: Documentation template: Bump copyright year	2017-01-26 10:56:34 +00:00
qt-module-defaults.qdocconf	…