Liang Qi 9bfe3ab71e Merge remote-tracking branch 'origin/5.8.0' into 5.8 ... Conflicts: doc/global/qt-cpp-defines.qdocconf src/plugins/platforms/android/qandroidplatformopenglcontext.h src/plugins/platforms/android/qandroidplatformtheme.h Change-Id: I13d51cc66f708138ff4d667ceea7d515992e58a4		2016-12-16 09:45:16 +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	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-31 09:26:35 +01:00
compat.qdocconf	qdoc: Fix the qdoc \include command	2013-08-22 16:11:29 +02:00
config.qdocconf	Automatically generate code attribution documentation	2016-08-10 06:11:18 +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 2016	2016-01-29 13:30:04 +00:00
html-footer.qdocconf	Bump copyright year to 2016	2016-01-29 13:30:04 +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: Online template: dynamically load footer content	2015-12-09 11:47:49 +00:00
macros.qdocconf	Doc: Add a custom \borderedimage macro	2016-09-23 10:48:38 +00:00
manifest-meta.qdocconf	Doc: Update the highlighted examples list	2016-12-14 07:20:12 +00:00
qt-cpp-defines.qdocconf	Merge remote-tracking branch 'origin/5.8.0' into 5.8	2016-12-16 09:45:16 +01: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	Bump copyright year to 2016	2016-01-29 13:30:04 +00:00
qt-module-defaults.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00