Qt Forward Merge Bot f94ca82e0f Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: .qmake.conf Change-Id: Ibfcb30053f3aacb8ec2ec480e146538c9bf440ea		2019-01-21 13:03:09 +01:00
..
externalsites	Doc: Fix broken links after page rename	2018-07-31 15:52:36 +00:00
includes	…
includes-online	…
template	doc: Update online CSS	2018-10-16 11:27:15 +00:00
compat.qdocconf	Doc: Ignore QML/JavaScript parsing errors	2017-02-07 08:34:39 +00:00
config.qdocconf	Doc: Use index.html as the home page reference	2018-06-05 15:48:46 +00:00
externalsites.qdocconf	…
fileextensions.qdocconf	…
html-config.qdocconf	…
html-footer-online.qdocconf	Doc: Increment copyright year in global doc templates	2018-04-04 06:56:00 +00:00
html-footer.qdocconf	Doc: Update br tag in html footer for XHTML compliance	2018-06-22 15:52:40 +00:00
html-header-offline.qdocconf	…
html-header-online.qdocconf	doc: Update online navigation header to match http://doc.qt.io/	2018-10-17 16:16:28 +00:00
macros.qdocconf	Documentation: Add \nullptr macro and use where applicable	2019-01-10 22:16:07 +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	Correct the documented visibility of some Widget methods	2018-07-11 15:21:56 +00: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	Doc: Add a define for online and offline documentation templates	2018-09-06 12:45:23 +00:00
qt-html-templates-online.qdocconf	Doc: Add a define for online and offline documentation templates	2018-09-06 12:45:23 +00:00
qt-module-defaults-offline.qdocconf	…
qt-module-defaults-online-commercial.qdocconf	…
qt-module-defaults-online.qdocconf	Doc: Increment copyright year in global doc templates	2018-04-04 06:56:00 +00:00
qt-module-defaults.qdocconf	…