Liang Qi 980567b3a3 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/android/templates/AndroidManifest.xml tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp Change-Id: I4c9679e3a8ebba118fbf4772301ff8fde60455b9		2019-01-26 08:35:40 +01:00
..
externalsites	Doc: Fix broken links after page rename	2018-07-31 15:52:36 +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: 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	Bump copyright year to 2019	2018-12-18 07:51:10 +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	Bump copyright year to 2019	2018-12-18 07:51:10 +00:00
html-footer.qdocconf	Bump copyright year to 2019	2018-12-18 07:51:10 +00:00
html-header-offline.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
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	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	Bump copyright year to 2019	2018-12-18 07:51:10 +00:00
qt-module-defaults.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00