qt5base-lts/doc/global
Liang Qi 6a772fd201 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.qmake.conf
	mkspecs/common/msvc-desktop.conf
	mkspecs/win32-g++/qmake.conf
	mkspecs/win32-icc/qmake.conf
	src/platformsupport/fontdatabases/mac/coretext.pri
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm

Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
2017-05-29 10:54:41 +02:00
..
externalsites Doc: Add Creating C++ Classes to externalsites/qtcreator.qdoc 2017-03-29 12:31:13 +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 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 macro for embedding YouTube videos 2017-03-06 13:43:58 +00:00
manifest-meta.qdocconf Doc: Add highlighting for a number of examples 2017-05-17 13:42:58 +00:00
qt-cpp-defines.qdocconf Merge remote-tracking branch 'origin/5.9' into dev 2017-05-29 10:54:41 +02: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 Doc: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00