Liang Qi ae2695535a Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/corelib/io/qfilesystemengine_win.cpp src/gui/text/qdistancefield.cpp src/plugins/platforms/xcb/qxcbconnection.h Change-Id: I1be4a6f440ccb7599991159e3cb9de60990e4b1e		2017-03-20 09:00:44 +01:00
..
externalsites	Doc: Enable global linking to new Qt Creator VCS subtopics	2016-11-25 10:52:04 +00:00
includes	Doc: Add a section all modules can use for example documentation.	2014-04-09 10:37:29 +02:00
includes-online	Unify license header usage.	2016-03-29 10:20:03 +00:00
template	Doc: Add macro for embedding YouTube videos	2017-03-06 13:43:58 +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	Doc: Do not include the external sites by default	2014-09-03 09:40:59 +02:00
fileextensions.qdocconf	Add shader files to examples documentation file list	2015-09-22 21:40:13 +00:00
html-config.qdocconf	QDoc: Introduce a variable to set table of contents depth.	2014-06-11 15:13:29 +02:00
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	Doc: Online template: dynamically load footer content	2015-12-09 11:47:49 +00:00
macros.qdocconf	Doc: Add macro for embedding YouTube videos	2017-03-06 13:43:58 +00:00
manifest-meta.qdocconf	Doc: Update the highlighted examples list	2016-12-14 07:20:12 +00:00
qt-cpp-defines.qdocconf	Doc: Ignore QT_SYSINFO_DEPRECATED_X	2017-03-10 08:00:58 +00:00
qt-html-templates-offline-simple.qdocconf	Doc: Use a navigation separator in the simple offline template	2015-10-28 11:55:05 +00:00
qt-html-templates-offline.qdocconf	Doc: Improve selection of offline template type	2015-10-21 08:15:35 +00:00
qt-html-templates-online.qdocconf	Doc: Update online documentation template	2015-02-26 12:26:15 +00:00
qt-module-defaults-offline.qdocconf	Doc: Improve selection of offline template type	2015-10-21 08:15:35 +00:00
qt-module-defaults-online-commercial.qdocconf	Doc: Update online documentation template	2015-02-26 12:26:15 +00:00
qt-module-defaults-online.qdocconf	Doc: Documentation template: Bump copyright year	2017-01-26 10:56:34 +00:00
qt-module-defaults.qdocconf